From f2224828a173c5b2bb0adb84601604b3d8c667e9 Mon Sep 17 00:00:00 2001 From: Francois Farquet Date: Tue, 10 Oct 2023 11:25:34 +0200 Subject: [PATCH 1/6] Temporary disable Quarkus gates and benchmarks until upgrade (GR-49326) --- .../ci/ci_common/benchmark-suites.libsonnet | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/compiler/ci/ci_common/benchmark-suites.libsonnet b/compiler/ci/ci_common/benchmark-suites.libsonnet index a70ba1b163bf..3e461467e03b 100644 --- a/compiler/ci/ci_common/benchmark-suites.libsonnet +++ b/compiler/ci/ci_common/benchmark-suites.libsonnet @@ -232,22 +232,6 @@ self.benchmark_cmd + ["shopcart-wrk:mixed-huge"] + hwlocBind_16C_32T + ["--"] + self.extra_vm_args + ["-Xms1024m", "-Xmx8192m", "-XX:ActiveProcessorCount=32", "-XX:MaxDirectMemorySize=8192m"], bench_upload, - # tika-wrk odt - self.benchmark_cmd + ["tika-wrk:odt-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms32m", "-Xmx150m", "-XX:ActiveProcessorCount=1"], - bench_upload, - self.benchmark_cmd + ["tika-wrk:odt-small"] + hwlocBind_2C_2T + ["--"] + self.extra_vm_args + ["-Xms64m", "-Xmx250m", "-XX:ActiveProcessorCount=2"], - bench_upload, - self.benchmark_cmd + ["tika-wrk:odt-medium"] + hwlocBind_4C_4T + ["--"] + self.extra_vm_args + ["-Xms128m", "-Xmx600m", "-XX:ActiveProcessorCount=4"], - bench_upload, - - # tika-wrk pdf - self.benchmark_cmd + ["tika-wrk:pdf-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms20m", "-Xmx80m", "-XX:ActiveProcessorCount=1"], - bench_upload, - self.benchmark_cmd + ["tika-wrk:pdf-small"] + hwlocBind_2C_2T + ["--"] + self.extra_vm_args + ["-Xms40m", "-Xmx200m", "-XX:ActiveProcessorCount=2"], - bench_upload, - self.benchmark_cmd + ["tika-wrk:pdf-medium"] + hwlocBind_4C_4T + ["--"] + self.extra_vm_args + ["-Xms80m", "-Xmx500m", "-XX:ActiveProcessorCount=4"], - bench_upload, - # petclinic-wrk self.benchmark_cmd + ["petclinic-wrk:mixed-tiny"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms32m", "-Xmx100m", "-XX:ActiveProcessorCount=1"], bench_upload, @@ -263,8 +247,6 @@ # helloworld-wrk self.benchmark_cmd + ["micronaut-helloworld-wrk:helloworld"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms8m", "-Xmx64m", "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"], bench_upload, - self.benchmark_cmd + ["quarkus-helloworld-wrk:helloworld"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms8m", "-Xmx64m", "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"], - bench_upload, self.benchmark_cmd + ["spring-helloworld-wrk:helloworld"] + hwlocBind_1C_1T + ["--"] + self.extra_vm_args + ["-Xms8m", "-Xmx64m", "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"], bench_upload ], From 66b3f104509f15a45528c91e3f17d7642286fb6c Mon Sep 17 00:00:00 2001 From: Doug Simon Date: Wed, 4 Oct 2023 15:21:06 +0200 Subject: [PATCH 2/6] renamed compiler package prefix to jdk.compiler.graal --- ci/common.jsonnet | 4 +- compiler/docs/CompilationPlanFuzzing.md | 2 +- compiler/docs/Debugging.md | 16 +- compiler/docs/JMH.md | 2 +- compiler/mx.compiler/mx_compiler.py | 13 +- compiler/mx.compiler/mx_graal_benchmark.py | 4 +- .../mx.compiler/mx_updategraalinopenjdk.py | 24 +- compiler/mx.compiler/suite.py | 75 +- .../javax.annotation.processing.Processor | 14 +- .../core/match/processor/MatchProcessor.java | 30 +- .../lir/processor/IntrinsicStubProcessor.java | 32 +- .../lir/processor/SyncPortProcessor.java | 10 +- .../nodeinfo/processor/ElementException.java | 2 +- .../processor/GraphNodeProcessor.java | 10 +- .../nodeinfo/processor/GraphNodeVerifier.java | 16 +- .../options/processor/OptionProcessor.java | 20 +- .../graal}/processor/AbstractProcessor.java | 2 +- .../graal}/processor/SuppressFBWarnings.java | 2 +- .../processor/APHotSpotSignature.java | 2 +- .../processor/AnnotationHandler.java | 4 +- .../replacements/processor/FoldHandler.java | 10 +- .../processor/GeneratedFoldPlugin.java | 14 +- .../GeneratedNodeIntrinsicPlugin.java | 33 +- .../processor/GeneratedPlugin.java | 8 +- .../processor/InjectedDependencies.java | 21 +- .../processor/NodeIntrinsicHandler.java | 34 +- .../processor/PluginGenerator.java | 28 +- .../ReplacementsAnnotationProcessor.java | 6 +- .../processor/ServiceProviderProcessor.java | 8 +- .../test/BlackholeDirectiveTest.java | 12 +- .../ConstantProbablityBranchFoldingTest.java | 12 +- .../test/ControlFlowAnchorDirectiveTest.java | 24 +- .../test/DeoptimizeDirectiveTest.java | 8 +- .../GraalDirectiveIntrinsificationTest.java | 8 +- .../test/IterationDirectiveTest.java | 14 +- .../directives/test/OpaqueDirectiveTest.java | 18 +- .../ProbabilityDirectiveShortCircuitTest.java | 24 +- .../test/ProbabilityDirectiveTest.java | 18 +- .../SwitchCaseProbabilityDirectiveTest.java | 20 +- .../graal}/api/test/ExportingClassLoader.java | 2 +- .../compiler/graal}/api/test/Graal.java | 6 +- .../graal}/api/test/GraalAPITest.java | 2 +- .../graal}/api/test/ModuleSupport.java | 4 +- .../test/AArch64AddressingModeTest.java | 12 +- .../test/AArch64BitCountAssemblerTest.java | 8 +- .../test/AArch64InstructionEncodingTest.java | 12 +- .../AArch64LoadStoreMergingAssemblerTest.java | 8 +- .../aarch64/test/AArch64MoveConstantTest.java | 8 +- .../aarch64/test/TestProtectedAssembler.java | 10 +- .../amd64/test/AMD64AssemblerUtilityTest.java | 26 +- .../graal}/asm/amd64/test/BitOpsTest.java | 18 +- .../test/IncrementDecrementMacroTest.java | 10 +- .../asm/amd64/test/IndirectCallTest.java | 8 +- .../asm/amd64/test/SimpleAssemblerTest.java | 18 +- .../graal}/asm/test/AssemblerTest.java | 34 +- .../aarch64/test/AArch64AddSubShiftTest.java | 6 +- .../aarch64/test/AArch64ArrayAddressTest.java | 12 +- .../aarch64/test/AArch64BitFieldTest.java | 6 +- .../test/AArch64BitwiseLogicalNotTest.java | 8 +- .../core/aarch64/test/AArch64CbzTest.java | 6 +- .../test/AArch64ConditionalSetTest.java | 8 +- .../aarch64/test/AArch64ElideL2ITest.java | 6 +- .../aarch64/test/AArch64FloatSqrtTest.java | 4 +- .../aarch64/test/AArch64LogicShiftTest.java | 6 +- .../core/aarch64/test/AArch64MNegTest.java | 4 +- .../aarch64/test/AArch64MatchRuleTest.java | 4 +- .../aarch64/test/AArch64MembarOpTest.java | 22 +- .../AArch64MergeExtendWithAddSubTest.java | 6 +- .../AArch64MergeNarrowWithAddSubTest.java | 6 +- .../AArch64MergeNarrowWithExtendTest.java | 6 +- .../test/AArch64MultiplyAddSubTest.java | 6 +- .../aarch64/test/AArch64MultiplyLongTest.java | 2 +- .../aarch64/test/AArch64NegateShiftTest.java | 6 +- .../test/AArch64PairLoadStoreTest.java | 4 +- .../aarch64/test/AArch64RotationTest.java | 4 +- .../test/AArch64TestBitAndBranchTest.java | 42 +- .../test/AArch64VolatileAccessesTest.java | 8 +- .../amd64/test/AMD64AddressLoweringTest.java | 24 +- .../core/amd64/test/AMD64AllocatorTest.java | 6 +- .../core/amd64/test/AMD64MatchRuleTest.java | 24 +- ...D64VolatileWriteMembarEliminationTest.java | 10 +- .../amd64/test/ConstantStackMoveTest.java | 14 +- .../core/amd64/test/StackStoreTest.java | 14 +- .../core/test/AbsCanonicalizationTest.java | 8 +- .../compiler/graal}/core/test/AllocSpy.java | 2 +- .../test/ArrayCopyVirtualizationTest.java | 6 +- .../core/test/ArrayLengthProviderTest.java | 2 +- .../core/test/BasePhaseBinaryGraphTest.java | 8 +- .../graal}/core/test/BciBlockMappingTest.java | 16 +- .../core/test/BoxingEliminationTest.java | 24 +- .../compiler/graal}/core/test/BoxingTest.java | 2 +- .../graal}/core/test/ByteBufferTest.java | 2 +- .../core/test/BytecodeDisassemblerTest.java | 4 +- .../test/CanonicalizedConversionTest.java | 16 +- .../core/test/CheckGraalInvariants.java | 107 +- .../core/test/CommonedConstantsTest.java | 4 +- .../core/test/CompareCanonicalizerTest.java | 18 +- .../core/test/CompareCanonicalizerTest2.java | 6 +- .../core/test/CompareCanonicalizerTest3.java | 26 +- .../core/test/CompilationResultTest.java | 10 +- .../core/test/CompilationWatchDogTest.java | 20 +- .../graal}/core/test/ConcreteSubtypeTest.java | 2 +- .../graal}/core/test/ConditionTest.java | 8 +- .../test/ConditionalEliminationMulTest.java | 12 +- .../test/ConditionalEliminationPiTest.java | 2 +- .../ConditionalEliminationRegressionTest.java | 70 +- ...ditionalEliminationStampInversionTest.java | 30 +- .../test/ConditionalEliminationTest1.java | 9 +- .../test/ConditionalEliminationTest10.java | 25 +- .../test/ConditionalEliminationTest11.java | 9 +- .../test/ConditionalEliminationTest12.java | 4 +- .../test/ConditionalEliminationTest13.java | 18 +- .../test/ConditionalEliminationTest14.java | 34 +- .../test/ConditionalEliminationTest15.java | 27 +- .../test/ConditionalEliminationTest16.java | 18 +- .../test/ConditionalEliminationTest2.java | 28 +- .../test/ConditionalEliminationTest3.java | 7 +- .../test/ConditionalEliminationTest4.java | 7 +- .../test/ConditionalEliminationTest5.java | 9 +- .../test/ConditionalEliminationTest6.java | 7 +- .../test/ConditionalEliminationTest7.java | 7 +- .../test/ConditionalEliminationTest8.java | 7 +- .../test/ConditionalEliminationTest9.java | 9 +- .../test/ConditionalEliminationTestBase.java | 30 +- .../graal}/core/test/ConditionalNodeTest.java | 8 +- .../test/ConstantArrayReadFoldingTest.java | 2 +- .../core/test/CopyOfVirtualizationTest.java | 6 +- .../test/CountedLoopMaxTripCountPiTest.java | 32 +- .../core/test/CountedLoopOverflowTest.java | 10 +- .../graal}/core/test/CountedLoopTest.java | 50 +- .../graal}/core/test/CountedLoopTest2.java | 18 +- .../test/CustomizedBytecodePatternTest.java | 2 +- .../test/DeMorganCanonicalizationTest.java | 12 +- .../graal}/core/test/DeepUnrollingTest.java | 6 +- .../core/test/DegeneratedLoopsTest.java | 12 +- .../core/test/DirectByteBufferTest.java | 2 +- .../core/test/DontReuseArgumentSpaceTest.java | 16 +- .../graal}/core/test/DumpPathTest.java | 12 +- .../graal}/core/test/DynamicConstantTest.java | 2 +- .../graal}/core/test/EarlyGVNTest.java | 54 +- .../graal}/core/test/EnumSwitchTest.java | 12 +- .../graal}/core/test/EnumValuesTest.java | 2 +- .../core/test/FinalizableSubclassTest.java | 26 +- .../test/FindUniqueConcreteMethodBugTest.java | 2 +- .../test/FindUniqueDefaultMethodTest.java | 10 +- .../core/test/FloatOptimizationTest.java | 2 +- .../graal}/core/test/FloatingDivTest.java | 28 +- .../graal}/core/test/FloatingReadTest.java | 26 +- .../graal}/core/test/FuzzTest36456.java | 2 +- .../graal}/core/test/FuzzTest36457.java | 2 +- .../test/GraalCompilerAssumptionsTest.java | 8 +- .../graal}/core/test/GraalCompilerTest.java | 166 +- .../test/GraalDebugHandlersFactoryTest.java | 14 +- .../graal}/core/test/GraphDumpingTest.java | 32 +- .../graal}/core/test/GraphEncoderTest.java | 16 +- .../graal}/core/test/GraphPrinterTest.java | 4 +- .../graal}/core/test/GraphResetDebugTest.java | 16 +- .../graal}/core/test/GraphScheduleTest.java | 14 +- .../test/GraphUtilOriginalValueTests.java | 4 +- .../graal}/core/test/GuardPrioritiesTest.java | 34 +- .../graal}/core/test/HashCodeTest.java | 18 +- .../core/test/IfCanonicalizerSwapTest.java | 4 +- .../graal}/core/test/IfCanonicalizerTest.java | 34 +- .../graal}/core/test/IfReorderTest.java | 4 +- .../core/test/ImplicitNullCheckTest.java | 30 +- .../graal}/core/test/InfopointReasonTest.java | 24 +- .../test/InstalledCodeInvalidationTest.java | 4 +- .../core/test/IntegerBoxEqualsTest.java | 8 +- .../core/test/IntegerDivPowerOf2Test.java | 10 +- .../IntegerDivRemCanonicalizationTest.java | 14 +- .../core/test/IntegerDivRemConstantTest.java | 2 +- .../test/IntegerEqualsCanonicalizerTest.java | 42 +- ...erThanCommonArithmeticCorrectnessTest.java | 6 +- ...rThanCommonArithmeticOptimizationTest.java | 20 +- ...egerLowerThanCommonArithmeticTestBase.java | 16 +- .../core/test/IntegerStampMulFoldTest.java | 4 +- .../core/test/IntegerStampShiftTest.java | 2 +- .../core/test/InterfaceMethodHandleTest.java | 8 +- .../core/test/InvocationPluginsTest.java | 14 +- .../graal}/core/test/InvokeExceptionTest.java | 12 +- .../graal}/core/test/InvokeHintsTest.java | 12 +- .../graal}/core/test/IsArrayTest.java | 2 +- .../graal}/core/test/LockEliminationTest.java | 28 +- .../graal}/core/test/LongNodeChainTest.java | 26 +- .../graal}/core/test/LoopFullUnrollTest.java | 18 +- .../graal}/core/test/LoopUnswitchTest.java | 30 +- .../core/test/MarkUnsafeAccessTest.java | 10 +- .../core/test/MaskingOptimizationTest.java | 8 +- .../graal}/core/test/MatchRuleTest.java | 18 +- .../core/test/MathCopySignStampTest.java | 14 +- .../graal}/core/test/MathSignumStampTest.java | 14 +- .../core/test/MemoryArithmeticTest.java | 6 +- .../test/MemoryGraphCanonicalizeTest.java | 8 +- .../graal}/core/test/MemoryScheduleTest.java | 56 +- .../core/test/MergeCanonicalizerTest.java | 4 +- .../test/MethodHandleEagerResolution.java | 10 +- .../graal}/core/test/MonitorGraphTest.java | 24 +- .../graal}/core/test/MoveGuardsLoopTest.java | 8 +- .../graal}/core/test/MulNegateTest.java | 4 +- .../graal}/core/test/NarrowingReadTest.java | 2 +- .../core/test/NegateCanonicalizationTest.java | 10 +- .../core/test/NestedArithmeticTest.java | 2 +- .../graal}/core/test/NestedLoopTest.java | 22 +- .../graal}/core/test/NewInstanceTest.java | 18 +- .../core/test/NodeCopyWithInputsTest.java | 8 +- .../graal}/core/test/NodeMapGraphTest.java | 10 +- .../graal}/core/test/NodePosIteratorTest.java | 38 +- .../graal}/core/test/NodePropertiesTest.java | 32 +- .../core/test/ObjectSubstitutionsTest.java | 2 +- .../core/test/OffHeapUnsafeAccessTest.java | 6 +- .../core/test/OnStackReplacementTest.java | 2 +- .../graal}/core/test/OptimizeExtendsTest.java | 2 +- .../core/test/OptimizedBoxNodeTest.java | 26 +- .../graal}/core/test/OptionsVerifierTest.java | 14 +- .../graal}/core/test/PhiCreationTests.java | 10 +- .../graal}/core/test/ProfilingInfoTest.java | 4 +- .../core/test/PushNodesThroughPiTest.java | 30 +- .../graal}/core/test/PushThroughIfTest.java | 12 +- .../core/test/ReadAfterCheckCastTest.java | 22 +- .../core/test/ReadConstantFoldingTest.java | 28 +- .../ReadConstantFoldingTestGenerator.java | 2 +- .../test/ReassociateAndCanonicalTest.java | 10 +- .../graal}/core/test/ReassociationTest.java | 18 +- .../core/test/ReentrantBlockIteratorTest.java | 18 +- .../core/test/ReferenceGetLoopTest.java | 14 +- .../test/ReflectionOptionDescriptors.java | 14 +- .../core/test/ResolveDynamicConstantTest.java | 4 +- .../ReverseBytesIntoArrayRegressionTest.java | 2 +- .../core/test/ScalarTypeSystemTest.java | 10 +- .../graal}/core/test/SchedulingTest.java | 28 +- .../graal}/core/test/SchedulingTest2.java | 50 +- .../core/test/ShortCircuitNodeTest.java | 9 +- .../graal}/core/test/SimpleCFGTest.java | 62 +- .../test/SingleImplementorInterfaceTest.java | 16 +- .../core/test/SingleRunSubphaseTest.java | 18 +- .../graal}/core/test/SpectreFenceTest.java | 26 +- .../test/SpeculativeGuardMovementTest.java | 24 +- ...culativeGuardMovementTrivialDeoptTest.java | 4 +- .../core/test/StableArrayReadFoldingTest.java | 10 +- .../core/test/StampCanonicalizerTest.java | 10 +- .../core/test/StampMemoryAccessTest.java | 6 +- .../core/test/StaticInterfaceFieldTest.java | 40 +- .../graal}/core/test/StraighteningTest.java | 8 +- .../core/test/SubWordArrayStoreTest.java | 4 +- .../core/test/SubWordFieldStoreTest.java | 2 +- .../graal}/core/test/SubWordInputTest.java | 2 +- .../graal}/core/test/SubWordInputTest2.java | 2 +- .../graal}/core/test/SubWordReturnTest.java | 2 +- .../graal}/core/test/SubWordTestUtil.java | 6 +- .../graal}/core/test/SubprocessTest.java | 12 +- .../core/test/SwitchCanonicalizerTest.java | 6 +- .../graal}/core/test/SwitchDyingLoopTest.java | 20 +- .../graal}/core/test/SwitchFoldingTest.java | 26 +- .../compiler/graal}/core/test/SwitchTest.java | 2 +- .../graal}/core/test/TestAutoboxConf.java | 4 +- .../graal}/core/test/TestBasePhase.java | 6 +- .../compiler/graal}/core/test/TestPhase.java | 8 +- .../test/TrivialInliningExplosionTest.java | 12 +- .../core/test/TwoSlotMarkerClearingTest.java | 2 +- .../graal}/core/test/TypeSystemTest.java | 28 +- .../graal}/core/test/TypeWriterTest.java | 12 +- .../core/test/UnbalancedLockingTest.java | 13 +- .../core/test/UnbalancedMonitorsTest.java | 16 +- .../test/UncheckedInterfaceProviderTest.java | 22 +- .../core/test/UnsafeCopyMemoryTest.java | 2 +- .../test/UnsafeGetStableArrayElement.java | 18 +- .../core/test/UnsafeReadEliminationTest.java | 32 +- .../core/test/UnsafeVirtualizationTest.java | 70 +- .../core/test/UnschedulableGraphTest.java | 32 +- .../graal}/core/test/UnsignedLongTest.java | 4 +- .../graal}/core/test/UnusedArray.java | 10 +- .../core/test/VerifyArchUsageInPlugins.java | 12 +- .../graal}/core/test/VerifyBailoutUsage.java | 16 +- .../core/test/VerifyBailoutUsageTest.java | 44 +- .../graal}/core/test/VerifyDebugUsage.java | 103 +- .../core/test/VerifyDebugUsageTest.java | 64 +- .../graal}/core/test/VerifyEndlessLoops.java | 30 +- .../core/test/VerifyFoldableMethods.java | 14 +- .../core/test/VerifyGetOptionsUsage.java | 14 +- .../core/test/VerifyGraphUniqueUsages.java | 16 +- .../core/test/VerifyInstanceOfUsage.java | 16 +- .../core/test/VerifyIterableNodeType.java | 33 +- .../core/test/VerifyMemoryKillCheck.java | 22 +- .../core/test/VerifyPluginFrameState.java | 30 +- .../core/test/VerifyProfileMethodUsage.java | 18 +- .../test/VerifySharedConstantEmptyArray.java | 20 +- .../core/test/VerifySnippetProbabilities.java | 44 +- .../core/test/VerifyStatelessPhases.java | 14 +- .../core/test/VerifyStringFormatterUsage.java | 36 +- .../core/test/VerifySystemPropertyUsage.java | 12 +- .../graal}/core/test/VerifyUnsafeAccess.java | 16 +- .../graal}/core/test/VerifyUpdateUsages.java | 24 +- .../core/test/VerifyUsageWithEquals.java | 28 +- .../graal}/core/test/VerifyVariableCasts.java | 22 +- .../core/test/VerifyVirtualizableTest.java | 56 +- .../core/test/VerifyVirtualizableUsage.java | 33 +- .../VolatileAccessReadEliminationTest.java | 12 +- ...tileReadEliminateWrongMemoryStateTest.java | 2 +- .../graal}/core/test/ZeroSignExtendTest.java | 2 +- .../core/test/backend/AllocatorTest.java | 22 +- .../graal}/core/test/backend/BackendTest.java | 18 +- .../core/test/deopt/CompiledMethodTest.java | 14 +- .../core/test/deopt/MonitorDeoptTest.java | 18 +- .../deopt/RethrowDeoptMaterializeTest.java | 8 +- .../test/deopt/RethrowExceptionLoopTest.java | 22 +- .../test/deopt/SafepointRethrowDeoptTest.java | 6 +- .../SynchronizedMethodDeoptimizationTest.java | 6 +- .../test/ea/AtomicVirtualizationTests.java | 2 +- .../test/ea/CountUppercaseParallelTest.java | 4 +- .../graal}/core/test/ea/EAMergingTest.java | 8 +- .../graal}/core/test/ea/EATestBase.java | 30 +- .../core/test/ea/EscapeAnalysisTest.java | 34 +- .../graal}/core/test/ea/ExpandLogicTest.java | 6 +- .../graal}/core/test/ea/NestedBoxingTest.java | 2 +- .../core/test/ea/PEAAssertionsTest.java | 10 +- .../core/test/ea/PEAReadEliminationTest.java | 20 +- .../PartialEscapeAnalysisIterationTest.java | 12 +- .../test/ea/PartialEscapeAnalysisTest.java | 30 +- .../ea/PartialEscapeAnalysisTreesTest.java | 12 +- .../ea/PartialEscapeOptimizationLogTest.java | 16 +- .../test/ea/PartialEscapeUnsafeStoreTest.java | 4 +- .../ea/PartialEscapeWithExceptionTest.java | 10 +- .../graal}/core/test/ea/PoorMansEATest.java | 24 +- .../core/test/ea/ReadEliminationTest.java | 36 +- .../graal}/core/test/ea/TrufflePEATest.java | 18 +- ...nsafeCompareAndSwapVirtualizationTest.java | 4 +- .../graal}/core/test/ea/UnsafeEATest.java | 24 +- .../core/test/inlining/InliningTest.java | 44 +- .../NestedLoopEffectsPhaseComplexityTest.java | 42 +- ...NestedLoopEffectsPhaseComplexityTest2.java | 52 +- .../core/test/jfr/TestGetEventWriter.java | 14 +- .../core/test/tutorial/GraalTutorial.java | 4 +- .../core/test/tutorial/InvokeGraal.java | 44 +- .../core/test/tutorial/StaticAnalysis.java | 62 +- .../test/tutorial/StaticAnalysisTests.java | 18 +- .../graal}/debug/test/CSVUtilTest.java | 6 +- .../debug/test/CompilationAlarmTest.java | 36 +- .../graal}/debug/test/DebugContextTest.java | 36 +- .../test/DebugContextTest.testLogging.input | 0 .../graal}/debug/test/GraalErrorTest.java | 4 +- .../graal}/debug/test/LogStreamTest.java | 4 +- .../compiler/graal}/debug/test/TTYTest.java | 4 +- .../graal}/debug/test/TimerKeyTest.java | 20 +- .../graal}/debug/test/VersionsTest.java | 4 +- .../compiler/graal}/graph/test/GraphTest.java | 10 +- .../graal}/graph/test/NodeBitMapTest.java | 20 +- .../graal}/graph/test/NodeFormatToTest.java | 6 +- .../graal}/graph/test/NodeInputListTest.java | 18 +- .../graal}/graph/test/NodeMapTest.java | 22 +- .../graal}/graph/test/NodeUnionFindTest.java | 10 +- .../graph/test/NodeUsageIterableTest.java | 10 +- .../graal}/graph/test/NodeUsagesTests.java | 281 ++- .../graph/test/NodeValidationChecksTest.java | 14 +- .../graal}/graph/test/TestNodeInterface.java | 2 +- .../graph/test/TypedNodeIteratorTest.java | 20 +- .../graph/test/TypedNodeIteratorTest2.java | 21 +- .../graph/test/graphio/GraphOutputTest.java | 10 +- .../graph/test/graphio/GraphSnippetTest.java | 4 +- .../graph/test/graphio/NodeEncodingTest.java | 6 +- .../test/matchers/NodeIterableContains.java | 6 +- .../test/matchers/NodeIterableCount.java | 4 +- .../test/matchers/NodeIterableIsEmpty.java | 4 +- .../test/AArch64UncompressPointerTest.java | 10 +- .../test/AMD64HotSpotFrameOmissionTest.java | 6 +- .../test/AMD64ReadAfterWriteMatchTest.java | 20 +- .../test/ArrayAccessInLoopToAddressTest.java | 4 +- .../amd64/test/BinaryMathStubTest.java | 8 +- .../graal}/hotspot/amd64/test/BmiAndn.java | 2 +- .../graal}/hotspot/amd64/test/BmiBlsi.java | 2 +- .../graal}/hotspot/amd64/test/BmiBlsmsk.java | 2 +- .../graal}/hotspot/amd64/test/BmiBlsr.java | 2 +- .../hotspot/amd64/test/BmiCompilerTest.java | 12 +- .../amd64/test/CompressedNullCheckTest.java | 8 +- .../amd64/test/DataPatchInConstantsTest.java | 52 +- .../amd64/test/MathPower0Point5Test.java | 8 +- .../test/NumberOfTrailingZeroings003.java | 4 +- ...ReachabilityFenceCanonicalizationTest.java | 18 +- .../hotspot/amd64/test/StubAVXTest.java | 77 +- .../hotspot/amd64/test/UnaryMathStubTest.java | 8 +- .../test/BenchmarkCounterOverflowTest.java | 28 +- .../lir/test/ExceedMaxOopMapStackOffset.java | 17 +- ...gateExceedingMaxOopMapStackOffsetTest.java | 21 +- .../test/Adler32SubstitutionsTest.java | 4 +- .../test/ArrayCopyIntrinsificationTest.java | 20 +- .../hotspot/test/ArrayNewInstanceTest.java | 6 +- .../hotspot/test/Base64SubstitutionsTest.java | 6 +- .../test/BigIntegerIntrinsicsTest.java | 19 +- .../hotspot/test/BoxDeoptimizationTest.java | 6 +- .../hotspot/test/CRC32CSubstitutionsTest.java | 4 +- .../hotspot/test/CRC32SubstitutionsTest.java | 5 +- .../hotspot/test/CheckGraalIntrinsics.java | 28 +- .../hotspot/test/CheckIndexLongTest.java | 22 +- .../hotspot/test/ClassReplacementsTest.java | 4 +- .../hotspot/test/ClassSubstitutionsTests.java | 34 +- .../hotspot/test/CompilationWrapperTest.java | 23 +- .../graal}/hotspot/test/CompileTheWorld.java | 78 +- .../hotspot/test/CompileTheWorldTest.java | 20 +- .../hotspot/test/CompressedOopTest.java | 5 +- .../graal}/hotspot/test/DataPatchTest.java | 18 +- .../test/DeferredBarrierAdditionTest.java | 44 +- .../test/DeoptimizeReasonAccountingTest.java | 32 +- .../hotspot/test/ExplicitExceptionTest.java | 10 +- .../test/ForeignCallDeoptimizeTest.java | 16 +- .../graal}/hotspot/test/GCStressTest.java | 2 +- .../test/GraalHotSpotVMConfigAccessTest.java | 10 +- .../graal}/hotspot/test/GraalOSRLockTest.java | 20 +- .../graal}/hotspot/test/GraalOSRTest.java | 8 +- .../graal}/hotspot/test/GraalOSRTestBase.java | 38 +- .../hotspot/test/GraalOnlyIntrinsicsTest.java | 14 +- .../hotspot/test/HotSpotBase64Test.java | 2 +- .../test/HotSpotClassInitializationTest.java | 16 +- .../test/HotSpotCryptoSubstitutionTest.java | 37 +- .../test/HotSpotDeoptExplicitExceptions.java | 14 +- .../test/HotSpotDeoptPostExceptions.java | 22 +- .../graal}/hotspot/test/HotSpotGHASHTest.java | 10 +- .../test/HotSpotGraalCompilerTest.java | 36 +- .../test/HotSpotGraalOptionValuesTest.java | 8 +- .../test/HotSpotInvokeJavaMethodTest.java | 18 +- ...tSpotManagedFailedSpeculationListTest.java | 10 +- .../test/HotSpotMethodSubstitutionTest.java | 6 +- .../hotspot/test/HotSpotMonitorValueTest.java | 12 +- .../hotspot/test/HotSpotNmethodTest.java | 6 +- .../test/HotSpotNodeSubstitutionsTest.java | 21 +- .../hotspot/test/HotSpotObjectSizeTest.java | 4 +- .../test/HotSpotResolvedObjectTypeTest.java | 6 +- .../test/HotSpotStackIntrospectionTest.java | 2 +- .../test/HotSpotStampMemoryAccessTest.java | 12 +- .../graal}/hotspot/test/HotSpotStubsTest.java | 18 +- .../test/HotSpotUnsafeSubstitutionTest.java | 7 +- .../graal}/hotspot/test/HsErrLogTest.java | 16 +- .../test/InstalledCodeExecuteHelperTest.java | 16 +- .../hotspot/test/JVMCIInfopointErrorTest.java | 56 +- .../test/JVMCIVersionCheckMaxValueTest.java | 6 +- .../hotspot/test/JVMCIVersionCheckTest.java | 8 +- .../hotspot/test/LambdaStableNameTest.java | 22 +- .../hotspot/test/LibGraalCompilerTest.java | 4 +- .../graal}/hotspot/test/LogNodeTest.java | 16 +- .../hotspot/test/MathDoubleFMATest.java | 10 +- .../test/MathFMAConstantInputTest.java | 4 +- .../graal}/hotspot/test/MathFloatFMATest.java | 10 +- .../hotspot/test/MemoryUsageBenchmark.java | 27 +- .../graal}/hotspot/test/ObjectCloneTest.java | 24 +- .../test/ObjectHashCodeInliningTest.java | 12 +- .../hotspot/test/OptionsInFileTest.java | 20 +- .../hotspot/test/PolymorphicInliningTest.java | 20 +- .../hotspot/test/ProfileReplayTest.java | 16 +- .../test/RangeCheckPredicatesTest.java | 26 +- .../graal}/hotspot/test/ReferenceTest.java | 8 +- .../hotspot/test/ReservedStackAccessTest.java | 6 +- .../test/StringInternConstantTest.java | 12 +- .../test/StringUTF16ToBytesGetCharsTest.java | 22 +- .../hotspot/test/TestIntrinsicCompiles.java | 33 +- .../hotspot/test/UnsafeNewArrayTest.java | 6 +- .../test/UnsafeWritebackMemoryTest.java | 6 +- .../test/VirtualThreadCarrierThreadTest.java | 4 +- .../hotspot/test/VirtualThreadJFRTest.java | 8 +- .../test/WriteBarrierAdditionTest.java | 71 +- .../compiler/graal}/jtt/JTTTest.java | 42 +- .../graal}/jtt/backend/ConstantPhiTest.java | 12 +- .../graal}/jtt/backend/EmptyMethodTest.java | 6 +- .../jtt/backend/LargeConstantSectionTest.java | 8 +- .../graal}/jtt/bytecode/BC_aaload.java | 5 +- .../graal}/jtt/bytecode/BC_aaload_1.java | 5 +- .../graal}/jtt/bytecode/BC_aastore.java | 5 +- .../graal}/jtt/bytecode/BC_aload_0.java | 5 +- .../graal}/jtt/bytecode/BC_aload_1.java | 5 +- .../graal}/jtt/bytecode/BC_aload_2.java | 5 +- .../graal}/jtt/bytecode/BC_aload_3.java | 5 +- .../graal}/jtt/bytecode/BC_anewarray.java | 5 +- .../graal}/jtt/bytecode/BC_areturn.java | 5 +- .../graal}/jtt/bytecode/BC_arraylength.java | 5 +- .../graal}/jtt/bytecode/BC_athrow.java | 5 +- .../graal}/jtt/bytecode/BC_baload.java | 5 +- .../graal}/jtt/bytecode/BC_bastore.java | 5 +- .../graal}/jtt/bytecode/BC_caload.java | 5 +- .../graal}/jtt/bytecode/BC_castore.java | 5 +- .../graal}/jtt/bytecode/BC_checkcast01.java | 5 +- .../graal}/jtt/bytecode/BC_checkcast02.java | 5 +- .../graal}/jtt/bytecode/BC_checkcast03.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_d2f.java | 5 +- .../graal}/jtt/bytecode/BC_d2i01.java | 5 +- .../graal}/jtt/bytecode/BC_d2i02.java | 5 +- .../graal}/jtt/bytecode/BC_d2l01.java | 5 +- .../graal}/jtt/bytecode/BC_d2l02.java | 5 +- .../graal}/jtt/bytecode/BC_d2l03.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_dadd.java | 5 +- .../graal}/jtt/bytecode/BC_daload.java | 5 +- .../graal}/jtt/bytecode/BC_dastore.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp01.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp02.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp03.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp04.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp05.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp06.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp07.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp08.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp09.java | 5 +- .../graal}/jtt/bytecode/BC_dcmp10.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ddiv.java | 2 +- .../compiler/graal}/jtt/bytecode/BC_dmul.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_dneg.java | 5 +- .../graal}/jtt/bytecode/BC_dneg2.java | 5 +- .../graal}/jtt/bytecode/BC_double_base.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_drem.java | 2 +- .../graal}/jtt/bytecode/BC_dreturn.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_dsub.java | 5 +- .../graal}/jtt/bytecode/BC_dsub2.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_f2d.java | 5 +- .../graal}/jtt/bytecode/BC_f2i01.java | 5 +- .../graal}/jtt/bytecode/BC_f2i02.java | 5 +- .../graal}/jtt/bytecode/BC_f2l01.java | 5 +- .../graal}/jtt/bytecode/BC_f2l02.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_fadd.java | 5 +- .../graal}/jtt/bytecode/BC_faload.java | 5 +- .../graal}/jtt/bytecode/BC_fastore.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp01.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp02.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp03.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp04.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp05.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp06.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp07.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp08.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp09.java | 5 +- .../graal}/jtt/bytecode/BC_fcmp10.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_fdiv.java | 2 +- .../graal}/jtt/bytecode/BC_fload.java | 5 +- .../graal}/jtt/bytecode/BC_fload_2.java | 5 +- .../graal}/jtt/bytecode/BC_float_base.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_fmul.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_fneg.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_frem.java | 2 +- .../graal}/jtt/bytecode/BC_freturn.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_fsub.java | 5 +- .../graal}/jtt/bytecode/BC_getfield.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_b.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_c.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_d.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_f.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_i.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_l.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_o.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_s.java | 5 +- .../graal}/jtt/bytecode/BC_getfield_z.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_b.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_c.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_d.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_f.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_i.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_l.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_s.java | 5 +- .../graal}/jtt/bytecode/BC_getstatic_z.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_i2b.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_i2c.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_i2d.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_i2f.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_i2l.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_i2s.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_iadd.java | 5 +- .../graal}/jtt/bytecode/BC_iadd2.java | 5 +- .../graal}/jtt/bytecode/BC_iadd3.java | 5 +- .../graal}/jtt/bytecode/BC_iadd_const0.java | 6 +- .../graal}/jtt/bytecode/BC_iadd_const1.java | 6 +- .../graal}/jtt/bytecode/BC_iadd_const2.java | 6 +- .../graal}/jtt/bytecode/BC_iadd_const3.java | 6 +- .../graal}/jtt/bytecode/BC_iaload.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_iand.java | 5 +- .../graal}/jtt/bytecode/BC_iastore.java | 5 +- .../graal}/jtt/bytecode/BC_iconst.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_idiv.java | 5 +- .../graal}/jtt/bytecode/BC_idiv2.java | 5 +- .../graal}/jtt/bytecode/BC_idiv_overflow.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ifeq.java | 5 +- .../graal}/jtt/bytecode/BC_ifeq_2.java | 5 +- .../graal}/jtt/bytecode/BC_ifeq_3.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ifge.java | 5 +- .../graal}/jtt/bytecode/BC_ifge_2.java | 5 +- .../graal}/jtt/bytecode/BC_ifge_3.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ifgt.java | 5 +- .../graal}/jtt/bytecode/BC_ificmplt1.java | 5 +- .../graal}/jtt/bytecode/BC_ificmplt2.java | 5 +- .../graal}/jtt/bytecode/BC_ificmpne1.java | 5 +- .../graal}/jtt/bytecode/BC_ificmpne2.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ifle.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_iflt.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ifne.java | 5 +- .../graal}/jtt/bytecode/BC_ifnonnull.java | 5 +- .../graal}/jtt/bytecode/BC_ifnonnull_2.java | 5 +- .../graal}/jtt/bytecode/BC_ifnonnull_3.java | 5 +- .../graal}/jtt/bytecode/BC_ifnull.java | 5 +- .../graal}/jtt/bytecode/BC_ifnull_2.java | 5 +- .../graal}/jtt/bytecode/BC_ifnull_3.java | 5 +- .../graal}/jtt/bytecode/BC_iinc_1.java | 5 +- .../graal}/jtt/bytecode/BC_iinc_2.java | 5 +- .../graal}/jtt/bytecode/BC_iinc_3.java | 5 +- .../graal}/jtt/bytecode/BC_iinc_4.java | 5 +- .../graal}/jtt/bytecode/BC_iload_0.java | 5 +- .../graal}/jtt/bytecode/BC_iload_0_1.java | 5 +- .../graal}/jtt/bytecode/BC_iload_0_2.java | 5 +- .../graal}/jtt/bytecode/BC_iload_1.java | 5 +- .../graal}/jtt/bytecode/BC_iload_1_1.java | 5 +- .../graal}/jtt/bytecode/BC_iload_2.java | 5 +- .../graal}/jtt/bytecode/BC_iload_3.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_imul.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ineg.java | 5 +- .../graal}/jtt/bytecode/BC_instanceof.java | 5 +- .../graal}/jtt/bytecode/BC_instanceof01.java | 10 +- .../jtt/bytecode/BC_invokeinterface.java | 5 +- .../graal}/jtt/bytecode/BC_invokespecial.java | 5 +- .../jtt/bytecode/BC_invokespecial2.java | 5 +- .../graal}/jtt/bytecode/BC_invokestatic.java | 5 +- .../graal}/jtt/bytecode/BC_invokevirtual.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ior.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_irem.java | 5 +- .../graal}/jtt/bytecode/BC_irem2.java | 5 +- .../graal}/jtt/bytecode/BC_irem3.java | 5 +- .../graal}/jtt/bytecode/BC_irem4.java | 5 +- .../graal}/jtt/bytecode/BC_ireturn.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ishl.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ishr.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_isub.java | 5 +- .../graal}/jtt/bytecode/BC_iushr.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ixor.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_l2d.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_l2f.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_l2i.java | 5 +- .../graal}/jtt/bytecode/BC_l2i_2.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ladd.java | 5 +- .../graal}/jtt/bytecode/BC_ladd2.java | 5 +- .../graal}/jtt/bytecode/BC_laload.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_land.java | 5 +- .../graal}/jtt/bytecode/BC_lastore.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lcmp.java | 5 +- .../graal}/jtt/bytecode/BC_ldc_01.java | 5 +- .../graal}/jtt/bytecode/BC_ldc_02.java | 5 +- .../graal}/jtt/bytecode/BC_ldc_03.java | 5 +- .../graal}/jtt/bytecode/BC_ldc_04.java | 5 +- .../graal}/jtt/bytecode/BC_ldc_05.java | 5 +- .../graal}/jtt/bytecode/BC_ldc_06.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_ldiv.java | 5 +- .../graal}/jtt/bytecode/BC_ldiv2.java | 5 +- .../graal}/jtt/bytecode/BC_ldiv3.java | 5 +- .../graal}/jtt/bytecode/BC_ldiv_overflow.java | 5 +- .../graal}/jtt/bytecode/BC_lload_0.java | 5 +- .../graal}/jtt/bytecode/BC_lload_01.java | 5 +- .../graal}/jtt/bytecode/BC_lload_1.java | 5 +- .../graal}/jtt/bytecode/BC_lload_2.java | 5 +- .../graal}/jtt/bytecode/BC_lload_3.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lmul.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lneg.java | 5 +- .../jtt/bytecode/BC_lookupswitch01.java | 5 +- .../jtt/bytecode/BC_lookupswitch02.java | 5 +- .../jtt/bytecode/BC_lookupswitch03.java | 5 +- .../jtt/bytecode/BC_lookupswitch04.java | 5 +- .../jtt/bytecode/BC_lookupswitch05.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lor.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lrem.java | 5 +- .../graal}/jtt/bytecode/BC_lrem2.java | 5 +- .../graal}/jtt/bytecode/BC_lreturn.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lshl.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lshr.java | 5 +- .../graal}/jtt/bytecode/BC_lshr02.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lsub.java | 5 +- .../graal}/jtt/bytecode/BC_lushr.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_lxor.java | 5 +- .../graal}/jtt/bytecode/BC_monitorenter.java | 5 +- .../jtt/bytecode/BC_monitorenter02.java | 5 +- .../jtt/bytecode/BC_multianewarray01.java | 5 +- .../jtt/bytecode/BC_multianewarray02.java | 5 +- .../jtt/bytecode/BC_multianewarray03.java | 5 +- .../jtt/bytecode/BC_multianewarray04.java | 5 +- .../compiler/graal}/jtt/bytecode/BC_new.java | 5 +- .../graal}/jtt/bytecode/BC_newarray.java | 5 +- .../graal}/jtt/bytecode/BC_newarray_02.java | 4 +- .../graal}/jtt/bytecode/BC_putfield_01.java | 5 +- .../graal}/jtt/bytecode/BC_putfield_02.java | 5 +- .../graal}/jtt/bytecode/BC_putfield_03.java | 5 +- .../graal}/jtt/bytecode/BC_putfield_04.java | 5 +- .../graal}/jtt/bytecode/BC_putstatic.java | 5 +- .../graal}/jtt/bytecode/BC_saload.java | 5 +- .../graal}/jtt/bytecode/BC_sastore.java | 5 +- .../graal}/jtt/bytecode/BC_tableswitch.java | 5 +- .../graal}/jtt/bytecode/BC_tableswitch2.java | 5 +- .../graal}/jtt/bytecode/BC_tableswitch3.java | 5 +- .../graal}/jtt/bytecode/BC_tableswitch4.java | 5 +- .../graal}/jtt/bytecode/BC_wide01.java | 5 +- .../graal}/jtt/bytecode/BC_wide02.java | 5 +- .../graal}/jtt/except/BC_aaload0.java | 4 +- .../graal}/jtt/except/BC_aaload1.java | 4 +- .../graal}/jtt/except/BC_aastore0.java | 4 +- .../graal}/jtt/except/BC_aastore1.java | 4 +- .../graal}/jtt/except/BC_anewarray.java | 4 +- .../graal}/jtt/except/BC_arraylength.java | 4 +- .../graal}/jtt/except/BC_athrow0.java | 4 +- .../graal}/jtt/except/BC_athrow1.java | 4 +- .../graal}/jtt/except/BC_athrow2.java | 4 +- .../graal}/jtt/except/BC_athrow3.java | 4 +- .../compiler/graal}/jtt/except/BC_baload.java | 4 +- .../graal}/jtt/except/BC_bastore.java | 4 +- .../compiler/graal}/jtt/except/BC_caload.java | 4 +- .../graal}/jtt/except/BC_castore.java | 4 +- .../graal}/jtt/except/BC_checkcast.java | 4 +- .../graal}/jtt/except/BC_checkcast1.java | 4 +- .../graal}/jtt/except/BC_checkcast2.java | 4 +- .../graal}/jtt/except/BC_checkcast3.java | 4 +- .../graal}/jtt/except/BC_checkcast4.java | 4 +- .../graal}/jtt/except/BC_checkcast5.java | 4 +- .../graal}/jtt/except/BC_checkcast6.java | 4 +- .../compiler/graal}/jtt/except/BC_daload.java | 4 +- .../graal}/jtt/except/BC_dastore.java | 4 +- .../compiler/graal}/jtt/except/BC_faload.java | 4 +- .../graal}/jtt/except/BC_fastore.java | 4 +- .../graal}/jtt/except/BC_getfield.java | 4 +- .../graal}/jtt/except/BC_getfield1.java | 6 +- .../compiler/graal}/jtt/except/BC_iaload.java | 4 +- .../graal}/jtt/except/BC_iastore.java | 4 +- .../compiler/graal}/jtt/except/BC_idiv.java | 4 +- .../compiler/graal}/jtt/except/BC_idiv2.java | 4 +- .../graal}/jtt/except/BC_invokespecial01.java | 4 +- .../graal}/jtt/except/BC_invokevirtual01.java | 4 +- .../graal}/jtt/except/BC_invokevirtual02.java | 4 +- .../compiler/graal}/jtt/except/BC_irem.java | 4 +- .../compiler/graal}/jtt/except/BC_laload.java | 4 +- .../graal}/jtt/except/BC_lastore.java | 4 +- .../compiler/graal}/jtt/except/BC_ldiv.java | 4 +- .../compiler/graal}/jtt/except/BC_ldiv2.java | 4 +- .../compiler/graal}/jtt/except/BC_lrem.java | 4 +- .../graal}/jtt/except/BC_monitorenter.java | 4 +- .../graal}/jtt/except/BC_multianewarray.java | 4 +- .../graal}/jtt/except/BC_newarray.java | 4 +- .../graal}/jtt/except/BC_putfield.java | 4 +- .../compiler/graal}/jtt/except/BC_saload.java | 4 +- .../graal}/jtt/except/BC_sastore.java | 4 +- .../graal}/jtt/except/Catch_Loop01.java | 4 +- .../graal}/jtt/except/Catch_Loop02.java | 4 +- .../graal}/jtt/except/Catch_Loop03.java | 4 +- .../graal}/jtt/except/Catch_NASE_1.java | 4 +- .../graal}/jtt/except/Catch_NASE_2.java | 4 +- .../graal}/jtt/except/Catch_NPE_00.java | 4 +- .../graal}/jtt/except/Catch_NPE_01.java | 4 +- .../graal}/jtt/except/Catch_NPE_02.java | 4 +- .../graal}/jtt/except/Catch_NPE_03.java | 4 +- .../graal}/jtt/except/Catch_NPE_04.java | 4 +- .../graal}/jtt/except/Catch_NPE_05.java | 4 +- .../graal}/jtt/except/Catch_NPE_06.java | 4 +- .../graal}/jtt/except/Catch_NPE_07.java | 4 +- .../graal}/jtt/except/Catch_NPE_08.java | 4 +- .../graal}/jtt/except/Catch_NPE_09.java | 4 +- .../graal}/jtt/except/Catch_NPE_10.java | 4 +- .../graal}/jtt/except/Catch_NPE_11.java | 4 +- .../except/Catch_StackOverflowError_01.java | 4 +- .../except/Catch_StackOverflowError_02.java | 4 +- .../except/Catch_StackOverflowError_03.java | 4 +- .../graal}/jtt/except/Catch_Two01.java | 4 +- .../graal}/jtt/except/Catch_Two02.java | 4 +- .../graal}/jtt/except/Catch_Two03.java | 4 +- .../graal}/jtt/except/Catch_Unresolved.java | 4 +- .../graal}/jtt/except/Catch_Unresolved01.java | 4 +- .../graal}/jtt/except/Catch_Unresolved02.java | 4 +- .../graal}/jtt/except/Catch_Unresolved03.java | 4 +- .../graal}/jtt/except/Except_Locals.java | 4 +- .../jtt/except/Except_Synchronized01.java | 4 +- .../jtt/except/Except_Synchronized02.java | 4 +- .../jtt/except/Except_Synchronized03.java | 4 +- .../jtt/except/Except_Synchronized04.java | 4 +- .../jtt/except/Except_Synchronized05.java | 4 +- .../compiler/graal}/jtt/except/Finally01.java | 4 +- .../compiler/graal}/jtt/except/Finally02.java | 4 +- .../jtt/except/StackTrace_AIOOBE_00.java | 4 +- .../graal}/jtt/except/StackTrace_CCE_00.java | 4 +- .../graal}/jtt/except/StackTrace_NPE_00.java | 4 +- .../graal}/jtt/except/StackTrace_NPE_01.java | 4 +- .../graal}/jtt/except/StackTrace_NPE_02.java | 4 +- .../graal}/jtt/except/StackTrace_NPE_03.java | 4 +- .../graal}/jtt/except/Throw_InCatch01.java | 4 +- .../graal}/jtt/except/Throw_InCatch02.java | 4 +- .../graal}/jtt/except/Throw_InCatch03.java | 4 +- .../graal}/jtt/except/Throw_InNested.java | 4 +- .../graal}/jtt/except/Throw_NPE_01.java | 4 +- .../jtt/except/Throw_Synchronized01.java | 4 +- .../jtt/except/Throw_Synchronized02.java | 4 +- .../jtt/except/Throw_Synchronized03.java | 4 +- .../jtt/except/Throw_Synchronized04.java | 4 +- .../jtt/except/Throw_Synchronized05.java | 4 +- .../jtt/except/UntrustedInterfaces.java | 8 +- .../graal}/jtt/hotpath/HP_allocate01.java | 4 +- .../graal}/jtt/hotpath/HP_allocate02.java | 5 +- .../graal}/jtt/hotpath/HP_allocate03.java | 4 +- .../graal}/jtt/hotpath/HP_allocate04.java | 5 +- .../graal}/jtt/hotpath/HP_array01.java | 4 +- .../graal}/jtt/hotpath/HP_array02.java | 5 +- .../graal}/jtt/hotpath/HP_array03.java | 4 +- .../graal}/jtt/hotpath/HP_array04.java | 5 +- .../graal}/jtt/hotpath/HP_control01.java | 5 +- .../graal}/jtt/hotpath/HP_control02.java | 4 +- .../graal}/jtt/hotpath/HP_convert01.java | 5 +- .../compiler/graal}/jtt/hotpath/HP_count.java | 5 +- .../graal}/jtt/hotpath/HP_dead01.java | 5 +- .../graal}/jtt/hotpath/HP_demo01.java | 5 +- .../graal}/jtt/hotpath/HP_field01.java | 4 +- .../graal}/jtt/hotpath/HP_field02.java | 4 +- .../graal}/jtt/hotpath/HP_field03.java | 5 +- .../graal}/jtt/hotpath/HP_field04.java | 5 +- .../compiler/graal}/jtt/hotpath/HP_idea.java | 5 +- .../graal}/jtt/hotpath/HP_inline01.java | 5 +- .../graal}/jtt/hotpath/HP_inline02.java | 4 +- .../graal}/jtt/hotpath/HP_invoke01.java | 5 +- .../compiler/graal}/jtt/hotpath/HP_life.java | 4 +- .../graal}/jtt/hotpath/HP_nest01.java | 4 +- .../graal}/jtt/hotpath/HP_nest02.java | 5 +- .../graal}/jtt/hotpath/HP_scope01.java | 5 +- .../graal}/jtt/hotpath/HP_scope02.java | 4 +- .../graal}/jtt/hotpath/HP_series.java | 4 +- .../graal}/jtt/hotpath/HP_trees01.java | 5 +- .../graal}/jtt/hotspot/Test6186134.java | 5 +- .../graal}/jtt/hotspot/Test6196102.java | 5 +- .../graal}/jtt/hotspot/Test6753639.java | 5 +- .../graal}/jtt/hotspot/Test6823354.java | 2 +- .../graal}/jtt/hotspot/Test6850611.java | 5 +- .../graal}/jtt/hotspot/Test6959129.java | 4 +- .../graal}/jtt/hotspot/Test7005594.java | 2 +- .../graal}/jtt/jdk/CharacterBits.java | 4 +- .../graal}/jtt/jdk/Class_getName.java | 4 +- .../graal}/jtt/jdk/DivideUnsigned.java | 4 +- .../compiler/graal}/jtt/jdk/EnumMap01.java | 4 +- .../compiler/graal}/jtt/jdk/EnumMap02.java | 4 +- .../compiler/graal}/jtt/jdk/IntegerBits.java | 4 +- .../jtt/jdk/IntegerShuffleBitsTest.java | 8 +- .../compiler/graal}/jtt/jdk/LongBits.java | 4 +- .../graal}/jtt/jdk/LongShuffleBitsTest.java | 8 +- .../compiler/graal}/jtt/jdk/ShortBits.java | 4 +- .../jtt/jdk/System_currentTimeMillis01.java | 4 +- .../jtt/jdk/System_currentTimeMillis02.java | 6 +- .../graal}/jtt/jdk/System_nanoTime01.java | 4 +- .../graal}/jtt/jdk/System_nanoTime02.java | 6 +- .../graal}/jtt/jdk/System_setOut.java | 4 +- .../graal}/jtt/jdk/Thread_setName.java | 4 +- .../graal}/jtt/jdk/UnsafeAccess01.java | 4 +- .../jtt/jdk/UnsafeAllocateInstance01.java | 4 +- .../graal}/jtt/jdk/Unsafe_compareAndSwap.java | 4 +- .../jdk/Unsafe_compareAndSwapNullCheck.java | 6 +- .../graal}/jtt/lang/Boxed_TYPE_01.java | 4 +- .../graal}/jtt/lang/Bridge_method01.java | 4 +- .../graal}/jtt/lang/CheckedListTest.java | 4 +- .../jtt/lang/ClassLoader_loadClass01.java | 4 +- .../graal}/jtt/lang/Class_Literal01.java | 4 +- .../graal}/jtt/lang/Class_asSubclass01.java | 4 +- .../graal}/jtt/lang/Class_cast01.java | 4 +- .../graal}/jtt/lang/Class_cast02.java | 4 +- .../graal}/jtt/lang/Class_forName01.java | 6 +- .../graal}/jtt/lang/Class_forName02.java | 6 +- .../graal}/jtt/lang/Class_forName03.java | 4 +- .../graal}/jtt/lang/Class_forName04.java | 4 +- .../graal}/jtt/lang/Class_forName05.java | 4 +- .../jtt/lang/Class_getComponentType01.java | 4 +- .../jtt/lang/Class_getInterfaces01.java | 4 +- .../graal}/jtt/lang/Class_getModifiers01.java | 4 +- .../graal}/jtt/lang/Class_getModifiers02.java | 4 +- .../graal}/jtt/lang/Class_getName01.java | 4 +- .../graal}/jtt/lang/Class_getName02.java | 4 +- .../jtt/lang/Class_getSimpleName01.java | 4 +- .../jtt/lang/Class_getSimpleName02.java | 4 +- .../jtt/lang/Class_getSuperClass01.java | 4 +- .../graal}/jtt/lang/Class_isArray01.java | 4 +- .../jtt/lang/Class_isAssignableFrom01.java | 4 +- .../jtt/lang/Class_isAssignableFrom02.java | 4 +- .../jtt/lang/Class_isAssignableFrom03.java | 4 +- .../graal}/jtt/lang/Class_isInstance01.java | 4 +- .../graal}/jtt/lang/Class_isInstance02.java | 4 +- .../graal}/jtt/lang/Class_isInstance03.java | 4 +- .../graal}/jtt/lang/Class_isInstance04.java | 4 +- .../graal}/jtt/lang/Class_isInstance05.java | 4 +- .../graal}/jtt/lang/Class_isInstance06.java | 4 +- .../graal}/jtt/lang/Class_isInstance07.java | 4 +- .../graal}/jtt/lang/Class_isInterface01.java | 4 +- .../graal}/jtt/lang/Class_isPrimitive01.java | 4 +- .../compiler/graal}/jtt/lang/Double_01.java | 4 +- .../graal}/jtt/lang/Double_conditional.java | 4 +- .../graal}/jtt/lang/Double_isInfinite.java | 4 +- .../graal}/jtt/lang/Double_toString.java | 4 +- .../compiler/graal}/jtt/lang/Float_01.java | 4 +- .../compiler/graal}/jtt/lang/Float_02.java | 4 +- .../compiler/graal}/jtt/lang/Float_03.java | 4 +- .../graal}/jtt/lang/Float_conditional.java | 4 +- .../graal}/jtt/lang/Float_isInfinite.java | 4 +- .../graal}/jtt/lang/Int_greater01.java | 4 +- .../graal}/jtt/lang/Int_greater02.java | 4 +- .../graal}/jtt/lang/Int_greater03.java | 4 +- .../graal}/jtt/lang/Int_greaterEqual01.java | 4 +- .../graal}/jtt/lang/Int_greaterEqual02.java | 4 +- .../graal}/jtt/lang/Int_greaterEqual03.java | 4 +- .../compiler/graal}/jtt/lang/Int_less01.java | 4 +- .../compiler/graal}/jtt/lang/Int_less02.java | 4 +- .../compiler/graal}/jtt/lang/Int_less03.java | 4 +- .../graal}/jtt/lang/Int_lessEqual01.java | 4 +- .../graal}/jtt/lang/Int_lessEqual02.java | 4 +- .../graal}/jtt/lang/Int_lessEqual03.java | 4 +- .../graal}/jtt/lang/Int_reverseBits.java | 4 +- .../graal}/jtt/lang/JDK_ClassLoaders01.java | 4 +- .../graal}/jtt/lang/JDK_ClassLoaders02.java | 4 +- .../graal}/jtt/lang/LambdaEagerTest.java | 10 +- .../graal}/jtt/lang/Long_greater01.java | 4 +- .../graal}/jtt/lang/Long_greater02.java | 4 +- .../graal}/jtt/lang/Long_greater03.java | 4 +- .../graal}/jtt/lang/Long_greaterEqual01.java | 4 +- .../graal}/jtt/lang/Long_greaterEqual02.java | 4 +- .../graal}/jtt/lang/Long_greaterEqual03.java | 4 +- .../compiler/graal}/jtt/lang/Long_less01.java | 4 +- .../compiler/graal}/jtt/lang/Long_less02.java | 4 +- .../compiler/graal}/jtt/lang/Long_less03.java | 4 +- .../graal}/jtt/lang/Long_lessEqual01.java | 4 +- .../graal}/jtt/lang/Long_lessEqual02.java | 4 +- .../graal}/jtt/lang/Long_lessEqual03.java | 4 +- .../graal}/jtt/lang/Long_reverseBits.java | 4 +- .../graal}/jtt/lang/Long_reverseBytes01.java | 4 +- .../graal}/jtt/lang/Long_reverseBytes02.java | 4 +- .../compiler/graal}/jtt/lang/Math_abs.java | 4 +- .../graal}/jtt/lang/Math_copySign.java | 4 +- .../compiler/graal}/jtt/lang/Math_cos.java | 4 +- .../compiler/graal}/jtt/lang/Math_exact.java | 4 +- .../compiler/graal}/jtt/lang/Math_exp.java | 4 +- .../compiler/graal}/jtt/lang/Math_log.java | 4 +- .../compiler/graal}/jtt/lang/Math_log10.java | 4 +- .../compiler/graal}/jtt/lang/Math_minMax.java | 4 +- .../compiler/graal}/jtt/lang/Math_pow.java | 6 +- .../compiler/graal}/jtt/lang/Math_round.java | 4 +- .../compiler/graal}/jtt/lang/Math_signum.java | 4 +- .../compiler/graal}/jtt/lang/Math_sin.java | 4 +- .../compiler/graal}/jtt/lang/Math_sqrt.java | 4 +- .../compiler/graal}/jtt/lang/Math_tan.java | 4 +- .../graal}/jtt/lang/Object_clone01.java | 4 +- .../graal}/jtt/lang/Object_clone02.java | 4 +- .../graal}/jtt/lang/Object_equals01.java | 4 +- .../graal}/jtt/lang/Object_getClass01.java | 4 +- .../graal}/jtt/lang/Object_hashCode01.java | 4 +- .../graal}/jtt/lang/Object_hashCode02.java | 4 +- .../graal}/jtt/lang/Object_notify01.java | 4 +- .../graal}/jtt/lang/Object_notify02.java | 4 +- .../graal}/jtt/lang/Object_notifyAll01.java | 4 +- .../graal}/jtt/lang/Object_notifyAll02.java | 4 +- .../graal}/jtt/lang/Object_toString01.java | 4 +- .../graal}/jtt/lang/Object_toString02.java | 4 +- .../graal}/jtt/lang/Object_wait01.java | 4 +- .../graal}/jtt/lang/Object_wait02.java | 4 +- .../graal}/jtt/lang/Object_wait03.java | 4 +- .../jtt/lang/ProcessEnvironment_init.java | 4 +- .../graal}/jtt/lang/StringCoding_Scale.java | 4 +- .../graal}/jtt/lang/String_intern01.java | 4 +- .../graal}/jtt/lang/String_intern02.java | 4 +- .../graal}/jtt/lang/String_intern03.java | 4 +- .../graal}/jtt/lang/String_valueOf01.java | 4 +- .../jtt/lang/System_identityHashCode01.java | 4 +- .../compiler/graal}/jtt/lang/UnaryMath.java | 6 +- .../graal}/jtt/loop/DegeneratedLoop.java | 4 +- .../compiler/graal}/jtt/loop/Loop01.java | 4 +- .../compiler/graal}/jtt/loop/Loop02.java | 4 +- .../compiler/graal}/jtt/loop/Loop03.java | 4 +- .../compiler/graal}/jtt/loop/Loop04.java | 4 +- .../compiler/graal}/jtt/loop/Loop05.java | 4 +- .../compiler/graal}/jtt/loop/Loop06.java | 4 +- .../compiler/graal}/jtt/loop/Loop07.java | 4 +- .../compiler/graal}/jtt/loop/Loop07_2.java | 4 +- .../compiler/graal}/jtt/loop/Loop08.java | 4 +- .../compiler/graal}/jtt/loop/Loop09.java | 4 +- .../compiler/graal}/jtt/loop/Loop09_2.java | 4 +- .../compiler/graal}/jtt/loop/Loop11.java | 4 +- .../compiler/graal}/jtt/loop/Loop12.java | 4 +- .../compiler/graal}/jtt/loop/Loop13.java | 4 +- .../compiler/graal}/jtt/loop/Loop14.java | 4 +- .../compiler/graal}/jtt/loop/Loop15.java | 4 +- .../compiler/graal}/jtt/loop/Loop16.java | 4 +- .../compiler/graal}/jtt/loop/Loop17.java | 4 +- .../compiler/graal}/jtt/loop/LoopEscape.java | 4 +- .../compiler/graal}/jtt/loop/LoopInline.java | 4 +- .../graal}/jtt/loop/LoopLastIndexOf.java | 4 +- .../graal}/jtt/loop/LoopNewInstance.java | 4 +- .../graal}/jtt/loop/LoopParseLong.java | 4 +- .../compiler/graal}/jtt/loop/LoopPhi.java | 4 +- .../jtt/loop/LoopPhiResolutionTest.java | 6 +- .../graal}/jtt/loop/LoopSpilling.java | 4 +- .../graal}/jtt/loop/LoopSwitch01.java | 4 +- .../compiler/graal}/jtt/loop/LoopUnroll.java | 4 +- .../SpillLoopPhiVariableAtDefinition.java | 6 +- .../graal}/jtt/micro/ArrayCompare01.java | 4 +- .../graal}/jtt/micro/ArrayCompare02.java | 4 +- .../graal}/jtt/micro/BC_invokevirtual2.java | 4 +- .../graal}/jtt/micro/BigByteParams01.java | 4 +- .../graal}/jtt/micro/BigDoubleParams02.java | 4 +- .../graal}/jtt/micro/BigFloatParams01.java | 4 +- .../graal}/jtt/micro/BigFloatParams02.java | 4 +- .../graal}/jtt/micro/BigIntParams01.java | 4 +- .../graal}/jtt/micro/BigIntParams02.java | 4 +- .../jtt/micro/BigInterfaceParams01.java | 4 +- .../graal}/jtt/micro/BigLongParams02.java | 4 +- .../graal}/jtt/micro/BigMixedParams01.java | 4 +- .../graal}/jtt/micro/BigMixedParams02.java | 4 +- .../graal}/jtt/micro/BigMixedParams03.java | 4 +- .../graal}/jtt/micro/BigMixedParams04.java | 4 +- .../graal}/jtt/micro/BigObjectParams01.java | 4 +- .../graal}/jtt/micro/BigObjectParams02.java | 4 +- .../graal}/jtt/micro/BigParamsAlignment.java | 4 +- .../graal}/jtt/micro/BigShortParams01.java | 4 +- .../graal}/jtt/micro/BigVirtualParams01.java | 4 +- .../compiler/graal}/jtt/micro/Bubblesort.java | 4 +- .../graal}/jtt/micro/ConstantLoadTest.java | 4 +- .../compiler/graal}/jtt/micro/Fibonacci.java | 4 +- .../graal}/jtt/micro/FloatingReads.java | 4 +- .../graal}/jtt/micro/InvokeInterface_01.java | 4 +- .../graal}/jtt/micro/InvokeInterface_02.java | 4 +- .../graal}/jtt/micro/InvokeInterface_03.java | 4 +- .../graal}/jtt/micro/InvokeInterface_04.java | 4 +- .../graal}/jtt/micro/InvokeVirtual_01.java | 4 +- .../graal}/jtt/micro/InvokeVirtual_02.java | 4 +- .../compiler/graal}/jtt/micro/Matrix01.java | 4 +- .../graal}/jtt/micro/ReferenceMap01.java | 4 +- .../graal}/jtt/micro/StrangeFrames.java | 4 +- .../graal}/jtt/micro/String_format01.java | 4 +- .../graal}/jtt/micro/String_format02.java | 4 +- .../graal}/jtt/micro/VarArgs_String01.java | 4 +- .../graal}/jtt/micro/VarArgs_Unroll.java | 4 +- .../graal}/jtt/micro/VarArgs_boolean01.java | 4 +- .../graal}/jtt/micro/VarArgs_byte01.java | 4 +- .../graal}/jtt/micro/VarArgs_char01.java | 4 +- .../graal}/jtt/micro/VarArgs_double01.java | 4 +- .../graal}/jtt/micro/VarArgs_float01.java | 4 +- .../graal}/jtt/micro/VarArgs_int01.java | 4 +- .../graal}/jtt/micro/VarArgs_long01.java | 4 +- .../graal}/jtt/micro/VarArgs_short01.java | 4 +- .../compiler/graal}/jtt/optimize/ABCE_01.java | 5 +- .../compiler/graal}/jtt/optimize/ABCE_02.java | 5 +- .../compiler/graal}/jtt/optimize/ABCE_03.java | 5 +- .../graal}/jtt/optimize/ArrayCopy01.java | 4 +- .../graal}/jtt/optimize/ArrayCopy02.java | 5 +- .../graal}/jtt/optimize/ArrayCopy03.java | 5 +- .../graal}/jtt/optimize/ArrayCopy04.java | 4 +- .../graal}/jtt/optimize/ArrayCopy05.java | 5 +- .../graal}/jtt/optimize/ArrayCopy06.java | 5 +- .../graal}/jtt/optimize/ArrayCopyGeneric.java | 5 +- .../graal}/jtt/optimize/ArrayLength01.java | 5 +- .../graal}/jtt/optimize/BC_idiv_16.java | 5 +- .../graal}/jtt/optimize/BC_idiv_4.java | 5 +- .../graal}/jtt/optimize/BC_imul_16.java | 5 +- .../graal}/jtt/optimize/BC_imul_4.java | 5 +- .../graal}/jtt/optimize/BC_ldiv_16.java | 5 +- .../graal}/jtt/optimize/BC_ldiv_4.java | 5 +- .../graal}/jtt/optimize/BC_lmul_16.java | 5 +- .../graal}/jtt/optimize/BC_lmul_4.java | 5 +- .../graal}/jtt/optimize/BC_lshr_C16.java | 5 +- .../graal}/jtt/optimize/BC_lshr_C24.java | 5 +- .../graal}/jtt/optimize/BC_lshr_C32.java | 4 +- .../graal}/jtt/optimize/BlockSkip01.java | 5 +- .../graal}/jtt/optimize/BoxingIdentity.java | 5 +- .../graal}/jtt/optimize/CE_InstanceOf.java | 4 +- .../compiler/graal}/jtt/optimize/Cmov01.java | 5 +- .../compiler/graal}/jtt/optimize/Cmov02.java | 5 +- .../graal}/jtt/optimize/Conditional01.java | 8 +- .../optimize/ConditionalElimination01.java | 5 +- .../optimize/ConditionalElimination02.java | 6 +- .../graal}/jtt/optimize/ConvertCompare.java | 5 +- .../graal}/jtt/optimize/DeadCode01.java | 5 +- .../graal}/jtt/optimize/DeadCode02.java | 4 +- .../graal}/jtt/optimize/Fold_Cast01.java | 5 +- .../graal}/jtt/optimize/Fold_Convert01.java | 5 +- .../graal}/jtt/optimize/Fold_Convert02.java | 5 +- .../graal}/jtt/optimize/Fold_Convert03.java | 4 +- .../graal}/jtt/optimize/Fold_Convert04.java | 5 +- .../graal}/jtt/optimize/Fold_Double01.java | 5 +- .../graal}/jtt/optimize/Fold_Double02.java | 5 +- .../graal}/jtt/optimize/Fold_Double03.java | 5 +- .../graal}/jtt/optimize/Fold_Double04.java | 5 +- .../graal}/jtt/optimize/Fold_Float01.java | 5 +- .../graal}/jtt/optimize/Fold_Float02.java | 5 +- .../graal}/jtt/optimize/Fold_Float03.java | 5 +- .../jtt/optimize/Fold_InstanceOf01.java | 5 +- .../graal}/jtt/optimize/Fold_Int01.java | 5 +- .../graal}/jtt/optimize/Fold_Int02.java | 5 +- .../graal}/jtt/optimize/Fold_Long01.java | 5 +- .../graal}/jtt/optimize/Fold_Long02.java | 5 +- .../graal}/jtt/optimize/Fold_Math01.java | 5 +- .../graal}/jtt/optimize/GuardMovement.java | 10 +- .../optimize/IfNodeCanonicalizationsTest.java | 10 +- .../graal}/jtt/optimize/InferStamp01.java | 5 +- .../graal}/jtt/optimize/Inline01.java | 5 +- .../graal}/jtt/optimize/Inline02.java | 5 +- .../graal}/jtt/optimize/InstanceOf.java | 8 +- .../compiler/graal}/jtt/optimize/LLE_01.java | 5 +- .../graal}/jtt/optimize/List_reorder_bug.java | 5 +- .../compiler/graal}/jtt/optimize/Logic0.java | 5 +- .../jtt/optimize/LongToSomethingArray01.java | 5 +- .../compiler/graal}/jtt/optimize/NCE_01.java | 5 +- .../compiler/graal}/jtt/optimize/NCE_02.java | 4 +- .../compiler/graal}/jtt/optimize/NCE_03.java | 5 +- .../compiler/graal}/jtt/optimize/NCE_04.java | 5 +- .../jtt/optimize/NCE_FlowSensitive01.java | 5 +- .../jtt/optimize/NCE_FlowSensitive02.java | 5 +- .../jtt/optimize/NCE_FlowSensitive03.java | 5 +- .../jtt/optimize/NCE_FlowSensitive04.java | 4 +- .../jtt/optimize/NCE_FlowSensitive05.java | 5 +- .../graal}/jtt/optimize/Narrow_byte01.java | 5 +- .../graal}/jtt/optimize/Narrow_byte02.java | 5 +- .../graal}/jtt/optimize/Narrow_byte03.java | 5 +- .../graal}/jtt/optimize/Narrow_byte04.java | 4 +- .../graal}/jtt/optimize/Narrow_char01.java | 5 +- .../graal}/jtt/optimize/Narrow_char02.java | 5 +- .../graal}/jtt/optimize/Narrow_char03.java | 5 +- .../graal}/jtt/optimize/Narrow_short01.java | 5 +- .../graal}/jtt/optimize/Narrow_short02.java | 5 +- .../graal}/jtt/optimize/Narrow_short03.java | 5 +- .../graal}/jtt/optimize/NestedLoop_EA.java | 24 +- .../compiler/graal}/jtt/optimize/Phi01.java | 5 +- .../compiler/graal}/jtt/optimize/Phi02.java | 5 +- .../compiler/graal}/jtt/optimize/Phi03.java | 5 +- .../jtt/optimize/ReassociateConstants.java | 2 +- .../graal}/jtt/optimize/Reduce_Convert01.java | 5 +- .../graal}/jtt/optimize/Reduce_Double01.java | 5 +- .../graal}/jtt/optimize/Reduce_Float01.java | 5 +- .../graal}/jtt/optimize/Reduce_Int01.java | 5 +- .../graal}/jtt/optimize/Reduce_Int02.java | 4 +- .../graal}/jtt/optimize/Reduce_Int03.java | 5 +- .../graal}/jtt/optimize/Reduce_Int04.java | 5 +- .../jtt/optimize/Reduce_IntShift01.java | 5 +- .../jtt/optimize/Reduce_IntShift02.java | 4 +- .../graal}/jtt/optimize/Reduce_Long01.java | 5 +- .../graal}/jtt/optimize/Reduce_Long02.java | 5 +- .../graal}/jtt/optimize/Reduce_Long03.java | 5 +- .../graal}/jtt/optimize/Reduce_Long04.java | 5 +- .../jtt/optimize/Reduce_LongShift01.java | 5 +- .../jtt/optimize/Reduce_LongShift02.java | 5 +- .../graal}/jtt/optimize/SchedulingBug_01.java | 5 +- .../graal}/jtt/optimize/SignExtendShort.java | 5 +- .../graal}/jtt/optimize/Switch01.java | 5 +- .../graal}/jtt/optimize/Switch02.java | 5 +- .../jtt/optimize/SwitchHashTableTest.java | 4 +- .../graal}/jtt/optimize/TrichotomyFloats.java | 4 +- .../graal}/jtt/optimize/TrichotomyTest.java | 20 +- .../graal}/jtt/optimize/TypeCastElem.java | 5 +- .../graal}/jtt/optimize/UnsafeDeopt.java | 6 +- .../graal}/jtt/optimize/VN_Cast01.java | 5 +- .../graal}/jtt/optimize/VN_Cast02.java | 5 +- .../graal}/jtt/optimize/VN_Convert01.java | 5 +- .../graal}/jtt/optimize/VN_Convert02.java | 5 +- .../graal}/jtt/optimize/VN_Double01.java | 5 +- .../graal}/jtt/optimize/VN_Double02.java | 5 +- .../graal}/jtt/optimize/VN_Double03.java | 5 +- .../graal}/jtt/optimize/VN_Field01.java | 5 +- .../graal}/jtt/optimize/VN_Field02.java | 5 +- .../graal}/jtt/optimize/VN_Float01.java | 4 +- .../graal}/jtt/optimize/VN_Float02.java | 5 +- .../graal}/jtt/optimize/VN_InstanceOf01.java | 5 +- .../graal}/jtt/optimize/VN_InstanceOf02.java | 4 +- .../graal}/jtt/optimize/VN_InstanceOf03.java | 5 +- .../graal}/jtt/optimize/VN_Int01.java | 5 +- .../graal}/jtt/optimize/VN_Int02.java | 5 +- .../graal}/jtt/optimize/VN_Int03.java | 5 +- .../graal}/jtt/optimize/VN_Long01.java | 5 +- .../graal}/jtt/optimize/VN_Long02.java | 5 +- .../graal}/jtt/optimize/VN_Long03.java | 4 +- .../graal}/jtt/optimize/VN_Loop01.java | 5 +- .../graal}/jtt/reflect/Array_get01.java | 5 +- .../graal}/jtt/reflect/Array_get02.java | 5 +- .../graal}/jtt/reflect/Array_get03.java | 5 +- .../jtt/reflect/Array_getBoolean01.java | 5 +- .../graal}/jtt/reflect/Array_getByte01.java | 5 +- .../graal}/jtt/reflect/Array_getChar01.java | 5 +- .../graal}/jtt/reflect/Array_getDouble01.java | 5 +- .../graal}/jtt/reflect/Array_getFloat01.java | 5 +- .../graal}/jtt/reflect/Array_getInt01.java | 5 +- .../graal}/jtt/reflect/Array_getLength01.java | 5 +- .../graal}/jtt/reflect/Array_getLong01.java | 5 +- .../graal}/jtt/reflect/Array_getShort01.java | 5 +- .../jtt/reflect/Array_newInstance01.java | 5 +- .../jtt/reflect/Array_newInstance02.java | 5 +- .../jtt/reflect/Array_newInstance03.java | 5 +- .../jtt/reflect/Array_newInstance04.java | 5 +- .../jtt/reflect/Array_newInstance05.java | 5 +- .../jtt/reflect/Array_newInstance06.java | 5 +- .../graal}/jtt/reflect/Array_set01.java | 5 +- .../graal}/jtt/reflect/Array_set02.java | 5 +- .../graal}/jtt/reflect/Array_set03.java | 5 +- .../jtt/reflect/Array_setBoolean01.java | 5 +- .../graal}/jtt/reflect/Array_setByte01.java | 5 +- .../graal}/jtt/reflect/Array_setChar01.java | 5 +- .../graal}/jtt/reflect/Array_setDouble01.java | 5 +- .../graal}/jtt/reflect/Array_setFloat01.java | 5 +- .../graal}/jtt/reflect/Array_setInt01.java | 5 +- .../graal}/jtt/reflect/Array_setLong01.java | 5 +- .../graal}/jtt/reflect/Array_setShort01.java | 5 +- .../jtt/reflect/Class_getDeclaredField01.java | 5 +- .../reflect/Class_getDeclaredMethod01.java | 5 +- .../graal}/jtt/reflect/Class_getField01.java | 5 +- .../graal}/jtt/reflect/Class_getField02.java | 5 +- .../graal}/jtt/reflect/Class_getMethod01.java | 5 +- .../graal}/jtt/reflect/Class_getMethod02.java | 5 +- .../jtt/reflect/Class_newInstance01.java | 5 +- .../jtt/reflect/Class_newInstance02.java | 5 +- .../jtt/reflect/Class_newInstance03.java | 5 +- .../jtt/reflect/Class_newInstance06.java | 5 +- .../jtt/reflect/Class_newInstance07.java | 5 +- .../graal}/jtt/reflect/Field_get01.java | 5 +- .../graal}/jtt/reflect/Field_get02.java | 5 +- .../graal}/jtt/reflect/Field_get03.java | 5 +- .../graal}/jtt/reflect/Field_get04.java | 5 +- .../graal}/jtt/reflect/Field_getType01.java | 5 +- .../graal}/jtt/reflect/Field_set01.java | 5 +- .../graal}/jtt/reflect/Field_set02.java | 8 +- .../graal}/jtt/reflect/Field_set03.java | 5 +- .../graal}/jtt/reflect/Invoke_except01.java | 5 +- .../graal}/jtt/reflect/Invoke_main01.java | 5 +- .../graal}/jtt/reflect/Invoke_main02.java | 5 +- .../graal}/jtt/reflect/Invoke_main03.java | 5 +- .../graal}/jtt/reflect/Invoke_virtual01.java | 5 +- .../reflect/Method_getParameterTypes01.java | 5 +- .../jtt/reflect/Method_getReturnType01.java | 5 +- .../jtt/threads/Monitor_contended01.java | 4 +- .../jtt/threads/Monitor_notowner01.java | 4 +- .../graal}/jtt/threads/Monitorenter01.java | 4 +- .../graal}/jtt/threads/Monitorenter02.java | 4 +- .../graal}/jtt/threads/Object_wait01.java | 4 +- .../graal}/jtt/threads/Object_wait02.java | 4 +- .../graal}/jtt/threads/Object_wait03.java | 10 +- .../graal}/jtt/threads/Object_wait04.java | 4 +- .../jtt/threads/SynchronizedLoopExit01.java | 4 +- .../threads/SynchronizedParserInlineTest.java | 4 +- .../graal}/jtt/threads/ThreadLocal01.java | 5 +- .../graal}/jtt/threads/ThreadLocal02.java | 5 +- .../graal}/jtt/threads/ThreadLocal03.java | 5 +- .../jtt/threads/Thread_currentThread01.java | 5 +- .../graal}/jtt/threads/Thread_getState01.java | 5 +- .../graal}/jtt/threads/Thread_getState02.java | 5 +- .../jtt/threads/Thread_holdsLock01.java | 5 +- .../graal}/jtt/threads/Thread_isAlive01.java | 5 +- .../jtt/threads/Thread_isInterrupted01.java | 5 +- .../jtt/threads/Thread_isInterrupted02.java | 4 +- .../jtt/threads/Thread_isInterrupted03.java | 4 +- .../jtt/threads/Thread_isInterrupted04.java | 5 +- .../jtt/threads/Thread_isInterrupted05.java | 4 +- .../graal}/jtt/threads/Thread_join01.java | 4 +- .../graal}/jtt/threads/Thread_join02.java | 4 +- .../graal}/jtt/threads/Thread_join03.java | 4 +- .../graal}/jtt/threads/Thread_new01.java | 5 +- .../graal}/jtt/threads/Thread_new02.java | 5 +- .../jtt/threads/Thread_setPriority01.java | 5 +- .../graal}/jtt/threads/Thread_sleep01.java | 4 +- .../graal}/jtt/threads/Thread_yield01.java | 4 +- .../graal}/lir/jtt/ConstantStackCastTest.java | 18 +- .../compiler/graal}/lir/jtt/LIRTest.java | 34 +- .../graal}/lir/jtt/LIRTestSpecification.java | 8 +- .../compiler/graal}/lir/jtt/LIRTestTest.java | 4 +- .../graal}/lir/jtt/StackMoveTest.java | 12 +- .../graal}/lir/jtt/StackStoreLoadTest.java | 12 +- .../test/CompositeValueReplacementTest1.java | 24 +- .../graal}/lir/test/GenericValueMapTest.java | 8 +- .../loop/test/LoopPartialUnrollTest.java | 64 +- .../graal}/loop/test/LoopsDataTest.java | 10 +- .../nodes/test/AbstractObjectStampTest.java | 8 +- .../graal}/nodes/test/AddNodeTest.java | 14 +- .../test/AndNodeCanonicalizationTest.java | 6 +- .../CompareZeroExtendWithConstantTest.java | 6 +- .../graal}/nodes/test/ConstantNodeTest.java | 6 +- .../nodes/test/ExceptionLivenessTest.java | 10 +- .../graal}/nodes/test/FloatStampTest.java | 16 +- .../graal}/nodes/test/GraphStateTest.java | 8 +- .../test/IfNodeCanonicalizationTest.java | 30 +- .../test/IfNodeCanonicalizationTest2.java | 16 +- .../graal}/nodes/test/InliningLogTest.java | 16 +- .../test/IntegerShuffleBitsStampTest.java | 16 +- .../nodes/test/IntegerStampFoldTest.java | 8 +- .../nodes/test/IntegerStampMaskTest.java | 8 +- .../graal}/nodes/test/IntegerStampTest.java | 36 +- .../nodes/test/LongShuffleBitsStampTest.java | 16 +- .../graal}/nodes/test/LoopLivenessTest.java | 8 +- .../nodes/test/LoopPhiCanonicalizerTest.java | 22 +- .../nodes/test/NarrowPreservesOrderTest.java | 24 +- .../graal}/nodes/test/NarrowTest.java | 6 +- .../test/NegateNodeCanonicalizationTest.java | 22 +- .../nodes/test/ObjectStampJoinTest.java | 12 +- .../nodes/test/ObjectStampMeetTest.java | 10 +- .../graal}/nodes/test/ObjectStampTest.java | 12 +- .../nodes/test/OptimizationLogTest.java | 38 +- .../test/OrNodeCanonicalizationTest.java | 6 +- .../test/PrimitiveStampBoundaryTest.java | 26 +- .../ReinterpretStampDoubleToLongTest.java | 16 +- .../test/ReinterpretStampFloatToIntTest.java | 16 +- .../test/ReinterpretStampIntToFloatTest.java | 18 +- .../ReinterpretStampLongToDoubleTest.java | 18 +- .../nodes/test/ReinterpretStampTest.java | 4 +- .../nodes/test/ShortCircuitOrNodeTest.java | 32 +- .../graal}/nodes/test/StampInverterTest.java | 16 +- .../graal}/nodes/test/StampToolTest.java | 16 +- .../nodes/test/StaticFieldAccessTest.java | 6 +- .../nodes/test/StructuredGraphTest.java | 14 +- .../nodes/test/SubCanonicalizationTest.java | 4 +- .../test/TruncateCanonicalizationTest.java | 6 +- .../test/XorNodeCanonicalizationTest.java | 6 +- .../test/NestedBooleanOptionKeyTest.java | 34 +- .../graal}/options/test/TestOptionKey.java | 66 +- .../phases/common/test/StampFactoryTest.java | 12 +- .../test/ArrayCopyExceptionSeenTest.java | 12 +- .../test/ArrayEqualsConstantLengthTest.java | 8 +- .../test/ArrayStoreBytecodeExceptionTest.java | 2 +- .../test/ArraysSubstitutionsTest.java | 16 +- .../test/ArraysSubstitutionsTestBase.java | 7 +- .../replacements/test/BitOpNodesTest.java | 24 +- .../test/BytecodeExceptionTest.java | 14 +- .../replacements/test/CharIsDigitTest.java | 4 +- .../replacements/test/CheckIndexTest.java | 20 +- .../test/ClassCastBytecodeExceptionTest.java | 4 +- .../test/CompiledExceptionHandlerTest.java | 26 +- .../CompiledNullPointerExceptionTest.java | 30 +- .../replacements/test/CountPositivesTest.java | 12 +- .../test/DeoptimizeOnExceptionTest.java | 20 +- .../test/DeoptimizeOnIntegerExactTest.java | 8 +- .../test/DeoptimizeOnVolatileReadTest.java | 8 +- .../replacements/test/DerivedOopTest.java | 28 +- .../test/DynamicNewArrayTest.java | 4 +- .../graal}/replacements/test/EdgesTest.java | 38 +- .../replacements/test/EncodeArrayTest.java | 10 +- .../test/FloatArraysEqualsTest.java | 12 +- .../replacements/test/HalfFloatTest.java | 6 +- .../replacements/test/HasNegativesTest.java | 12 +- .../test/IndexOobBytecodeExceptionTest.java | 4 +- .../test/InstanceOfDynamicTest.java | 6 +- .../replacements/test/InstanceOfTest.java | 16 +- .../test/IntegerExactExceptionTest.java | 4 +- .../test/IntegerExactFoldTest.java | 40 +- .../test/IntegerSubOverflowsTest.java | 4 +- .../graal}/replacements/test/InvokeTest.java | 6 +- .../test/InvokerSignatureMismatchTest.java | 12 +- .../test/MathMultiplyHighTest.java | 14 +- .../replacements/test/MathRoundTest.java | 4 +- .../test/MethodHandleImplTest.java | 2 +- .../test/MethodHandleMacroTest.java | 24 +- .../test/MethodSubstitutionTest.java | 26 +- .../graal}/replacements/test/MonitorTest.java | 16 +- .../test/NestedExceptionHandlerTest.java | 18 +- .../replacements/test/NewArrayTest.java | 4 +- .../replacements/test/NewInstanceTest.java | 4 +- .../replacements/test/NewMultiArrayTest.java | 14 +- .../test/NullBytecodeExceptionTest.java | 2 +- .../replacements/test/ObjectAccessTest.java | 30 +- .../replacements/test/PEGraphDecoderTest.java | 60 +- .../graal}/replacements/test/PointerTest.java | 36 +- .../test/PointerTrackingTest.java | 26 +- .../replacements/test/ReplacementsTest.java | 10 +- .../replacements/test/SnippetsTest.java | 26 +- .../test/StandardMethodSubstitutionsTest.java | 24 +- .../test/StringCompareToAVX512Test.java | 4 +- .../test/StringCompareToTest.java | 16 +- .../test/StringCompressInflateTest.java | 22 +- .../test/StringEqualsConstantTest.java | 14 +- .../replacements/test/StringEqualsTest.java | 4 +- .../replacements/test/StringGetBytesTest.java | 8 +- .../test/StringHashConstantTest.java | 14 +- .../StringIndexOfCharConstantBindingTest.java | 18 +- .../test/StringIndexOfCharTest.java | 4 +- .../test/StringIndexOfConstantTest.java | 10 +- .../test/StringIndexOfDeoptimizeTest.java | 6 +- .../replacements/test/StringIndexOfTest.java | 2 +- .../test/StringIndexOfTestBase.java | 4 +- .../test/StringIntrinsicRangeChecksTest.java | 10 +- .../test/StringSubstitutionTestBase.java | 6 +- .../test/StringSubstitutionsTest.java | 8 +- .../SubstitutionNodeSourcePositionTest.java | 43 +- .../test/SystemArrayCopyTest.java | 16 +- .../replacements/test/TypeCheckTest.java | 10 +- .../test/UnsafeBooleanAccessTest.java | 4 +- .../test/UnsafeObjectReplacementsTest.java | 6 +- .../test/UnsafeReplacementsTest.java | 4 +- .../test/UnsafeSubstitutionsTest.java | 2 +- .../test/UnsignedIntegerTest.java | 4 +- .../replacements/test/UnsignedMathTest.java | 6 +- .../test/UnwindExceptionToCallerTest.java | 4 +- .../replacements/test/VarHandleTest.java | 26 +- .../test/VectorizedHashCodeTest.java | 8 +- .../graal}/replacements/test/WordTest.java | 18 +- .../ClassfileBytecodeProviderTest.java | 146 +- .../compiler/graal}/test/AddExports.java | 2 +- .../compiler/graal}/test/AddJVM.java | 2 +- .../compiler/graal}/test/AddModules.java | 2 +- .../compiler/graal}/test/CommandLine.java | 2 +- .../compiler/graal}/test/CountUppercase.java | 2 +- .../compiler/graal}/test/GraalTest.java | 66 +- .../compiler/graal}/test/SubprocessUtil.java | 4 +- .../test/AOTSupportCompilationTest.java | 6 +- .../test/AbstractSplittingStrategyTest.java | 2 +- .../graal}/truffle/test/AddExports.java | 2 +- .../test/AgnosticInliningPhaseTest.java | 16 +- ...locationReporterPartialEvaluationTest.java | 2 +- .../test/ArrayUtilsIndexOfWithMaskTest.java | 8 +- ...UtilsRegionEqualsWithMaskConstantTest.java | 24 +- .../ArrayUtilsRegionEqualsWithMaskTest.java | 8 +- .../graal}/truffle/test/ArrayUtilsTest.java | 8 +- .../AssumedValuePartialEvaluationTest.java | 8 +- .../test/AssumptionPartialEvaluationTest.java | 10 +- .../test/BailoutPartialEvaluationTest.java | 6 +- .../test/BeginNodeOptimizationTest.java | 8 +- ...ecodeInterpreterPartialEvaluationTest.java | 10 +- .../truffle/test/BytecodeOSRNodeTest.java | 4 +- .../test/CachedLibraryCompilationTest.java | 16 +- .../test/CastExactPartialEvaluationTest.java | 10 +- .../truffle/test/CodeInvalidationTest.java | 2 +- ...CompilationFinalPartialEvaluationTest.java | 6 +- ...nalWeakReferencePartialEvaluationTest.java | 6 +- .../truffle/test/CompilationMemoryTest.java | 2 +- .../truffle/test/CompilerAssertsTest.java | 20 +- .../test/CompilerDirectivesTypeTest.java | 10 +- .../test/CompilerInitializationTest.java | 2 +- .../truffle/test/CompilerLoggingTest.java | 6 +- .../truffle/test/CompilerOptionTest.java | 2 +- .../truffle/test/ConditionAnchoringTest.java | 56 +- .../test/ContextLookupCompilationTest.java | 8 +- ...rolFlowExceptionPartialEvaluationTest.java | 6 +- .../test/DFAPartialEvaluationTest.java | 2 +- .../graal}/truffle/test/DefaultLoomTest.java | 2 +- .../truffle/test/DeoptInvalidateListener.java | 2 +- .../DynamicObjectPartialEvaluationTest.java | 28 +- .../truffle/test/EncodedGraphCacheTest.java | 16 +- .../graal}/truffle/test/EngineModeTest.java | 2 +- .../test/EnumPartialEvaluationTest.java | 6 +- .../graal}/truffle/test/ExactMathTest.java | 8 +- .../truffle/test/ExceptionActionTest.java | 6 +- .../test/ExecutionListenerCompilerTest.java | 2 +- .../test/ExitDuringCompilationTest.java | 2 +- .../test/ExplodeLoopBlockDuplicationTest.java | 2 +- .../test/FinalBitSetCompilationTest.java | 2 +- .../truffle/test/FlushEngineQueueTest.java | 2 +- .../test/FrameAccessVerificationTest.java | 24 +- .../truffle/test/FrameDescriptorTest.java | 8 +- .../truffle/test/FrameHostReadsTest.java | 12 +- .../graal}/truffle/test/GR35581Test.java | 2 +- .../graal}/truffle/test/GR36613Test.java | 2 +- .../test/GenerateInlineCompilationTest.java | 12 +- .../test/GetRootNodeCompilationTest.java | 10 +- .../test/GraalTruffleRuntimeListenerTest.java | 4 +- .../truffle/test/HashCodeIntrinsicTest.java | 4 +- ...nliningBytecodeInterpreterExampleTest.java | 24 +- .../HostInliningBytecodeInterpreterTest.java | 16 +- .../graal}/truffle/test/HostInliningTest.java | 44 +- .../truffle/test/IndirectCallSiteTest.java | 2 +- .../test/InstrumentBranchesPhaseTest.java | 23 +- .../test/InstrumentationCompilerTest.java | 2 +- .../test/LanguageContextFreedTest.java | 2 +- .../LazyClassLoadingTargetNegativeTest.java | 4 +- .../LazyClassLoadingTargetPositiveTest.java | 4 +- .../truffle/test/LazyClassLoadingTest.java | 58 +- .../truffle/test/LibraryCompilationTest.java | 2 +- .../LibraryInheritanceCompilationTest.java | 4 +- .../test/LibrarySplittingStrategyTest.java | 2 +- .../graal}/truffle/test/LoomUtils.java | 2 +- .../graal}/truffle/test/LoopNodeOSRTest.java | 2 +- .../test/LoopNodePartialEvaluationTest.java | 12 +- .../truffle/test/MaterializedFrameTest.java | 14 +- .../truffle/test/MergeExplodeProxyTest.java | 10 +- .../MultiTierAssumptionInvalidationTest.java | 2 +- .../test/MultiTierCompilationTest.java | 2 +- .../truffle/test/NodeLibraryCompilerTest.java | 8 +- .../test/NodeLibrarySLCompilerTest.java | 2 +- .../graal}/truffle/test/NodeLimitTest.java | 8 +- .../test/NodeSplittingStrategyTest.java | 2 +- .../graal}/truffle/test/OSRCancelTest.java | 2 +- ...tsRequireNonNullPartialEvaluationTest.java | 8 +- .../truffle/test/OptimizedBlockNodeTest.java | 4 +- .../truffle/test/OptimizedCallTargetTest.java | 8 +- .../truffle/test/OptimizedLoomTest.java | 2 +- .../test/OptimizedOSRLoopNodeTest.java | 2 +- .../truffle/test/OverrideOptionsTest.java | 2 +- .../truffle/test/PartialEvaluationTest.java | 48 +- .../truffle/test/PerformanceWarningTest.java | 12 +- ...hiStampInferencePartialEvaluationTest.java | 6 +- .../graal}/truffle/test/PhiTransformTest.java | 36 +- .../test/PolyglotEngineOptionsTest.java | 2 +- ...lyglotHostObjectPartialEvaluationTest.java | 2 +- ...agateHotnessToLexicalSingleCallerTest.java | 2 +- .../test/ResourceLimitsCompilationTest.java | 22 +- .../test/RewriteDuringCompilationTest.java | 4 +- .../test/SLCompileImmediatelyTestSuite.java | 2 +- .../truffle/test/SLTruffleGraalTestSuite.java | 24 +- .../test/SafepointRethrowDeoptPETest.java | 7 +- .../test/SimplePartialEvaluationTest.java | 89 +- .../test/StaticObjectCompilationTest.java | 30 +- .../StringNodeInliningCompilationTest.java | 2 +- .../truffle/test/TestWithPolyglotOptions.java | 2 +- .../test/TestWithSynchronousCompiling.java | 2 +- .../ThreadsActivationCompilationTest.java | 2 +- .../truffle/test/TraceCompilationTest.java | 8 +- .../test/TransferToInterpreterTest.java | 2 +- .../test/TruffleBoundaryExceptionsTest.java | 2 +- .../test/TruffleBoundaryInliningTest.java | 6 +- .../truffle/test/TruffleCompilerImplTest.java | 16 +- .../test/TruffleContextCompilationTest.java | 2 +- .../test/TruffleDirectCallNodeTest.java | 2 +- .../test/TruffleEnsureVirtualizedTest.java | 8 +- ...TruffleExceptionPartialEvaluationTest.java | 6 +- .../truffle/test/TruffleHostInliningTest.java | 2 +- .../TruffleLoggerPartialEvaluationTest.java | 9 +- .../test/TruffleOptionsByClassLoaderTest.java | 2 +- .../test/TruffleReturnBoxedParameterTest.java | 8 +- .../truffle/test/TruffleRuntimeTest.java | 6 +- .../truffle/test/TruffleShutdownHookTest.java | 2 +- ...ffleToTruffleCallExceptionHandlerTest.java | 6 +- .../truffle/test/TruffleValueTypeTest.java | 16 +- .../test/UnrollLoopBlockDuplicationTest.java | 2 +- .../test/VarHandlePartialEvaluationTest.java | 6 +- .../test/builtins/SLAssertFalseBuiltin.java | 2 +- .../test/builtins/SLAssertTrueBuiltin.java | 2 +- .../test/builtins/SLAssertionError.java | 2 +- .../builtins/SLCallFunctionsWithBuiltin.java | 2 +- .../builtins/SLCallUntilOptimizedBuiltin.java | 2 +- .../SLDeoptimizeWhenCompiledBuiltin.java | 2 +- .../builtins/SLDisableSplittingBuiltin.java | 2 +- .../test/builtins/SLGetOptionBuiltin.java | 2 +- .../test/builtins/SLGraalRuntimeBuiltin.java | 2 +- .../SLIsCompilationConstantBuiltin.java | 2 +- .../test/builtins/SLIsOptimizedBuiltin.java | 2 +- .../SLTestTruffleBoundary01Builtin.java | 2 +- .../SLWaitForOptimizationBuiltin.java | 2 +- .../test/collection/BTreeQueueTest.java | 2 +- .../DelegatingBlockingQueueTest.java | 2 +- .../truffle/test/inlining/InlineOnlyTest.java | 2 +- .../truffle/test/inlining/InliningTest.java | 2 +- .../libgraal/JNIExceptionWrapperTest.java | 12 +- .../truffle/test/nodes/AbstractTestNode.java | 2 +- .../truffle/test/nodes/AddTestNode.java | 4 +- .../nodes/AssumptionCutsBranchTestNode.java | 2 +- .../truffle/test/nodes/BlockTestNode.java | 2 +- .../truffle/test/nodes/ConstantTestNode.java | 2 +- .../nodes/ConstantWithAssumptionTestNode.java | 2 +- .../nodes/ExplodeLoopUntilReturnNode.java | 2 +- .../ExplodeLoopUntilReturnWithThrowNode.java | 2 +- .../test/nodes/InliningNullCheckNode1.java | 2 +- .../test/nodes/InliningNullCheckNode2.java | 2 +- .../truffle/test/nodes/IsLoggableNode.java | 2 +- .../truffle/test/nodes/LambdaTestNode.java | 2 +- .../truffle/test/nodes/LoadLocalTestNode.java | 2 +- .../truffle/test/nodes/LoggingNode.java | 2 +- .../truffle/test/nodes/LoopTestNode.java | 2 +- .../nodes/NeverPartOfCompilationTestNode.java | 2 +- .../test/nodes/NonConstantTestNode.java | 2 +- .../truffle/test/nodes/ObjectEqualsNode.java | 2 +- .../test/nodes/ObjectHashCodeNode.java | 2 +- .../test/nodes/PartialIntrinsicNode.java | 2 +- .../truffle/test/nodes/RecursionTestNode.java | 2 +- .../truffle/test/nodes/RootTestNode.java | 4 +- .../test/nodes/StoreLocalTestNode.java | 2 +- .../truffle/test/nodes/StringEqualsNode.java | 2 +- .../test/nodes/StringHashCodeFinalNode.java | 2 +- .../nodes/StringHashCodeNonFinalNode.java | 2 +- .../nodes/SynchronizedExceptionMergeNode.java | 2 +- .../truffle/test/nodes/TestNodeFactory.java | 2 +- .../test/nodes/UnrollLoopUntilReturnNode.java | 2 +- .../UnrollLoopUntilReturnWithThrowNode.java | 2 +- .../nodes/explosion/LoopExplosionPhiNode.java | 4 +- .../explosion/NestedExplodedLoopTestNode.java | 4 +- .../TwoMergesExplodedLoopTestNode.java | 4 +- .../nodes/explosion/UnrollingTestNode.java | 12 +- .../strings/TStringConstantFoldingTest.java | 10 +- ...TStringOpsCalcStringAttributesBMPTest.java | 4 +- ...ringOpsCalcStringAttributesLatin1Test.java | 4 +- ...tringAttributesReturnValuesInSyncTest.java | 4 +- ...tringOpsCalcStringAttributesUTF16Test.java | 4 +- ...tringOpsCalcStringAttributesUTF32Test.java | 4 +- ...StringOpsCalcStringAttributesUTF8Test.java | 4 +- .../TStringOpsCompareConstantStrideTest.java | 10 +- .../TStringOpsCompareConstantTest.java | 12 +- .../test/strings/TStringOpsCompareTest.java | 4 +- .../TStringOpsCopyConstantStrideTest.java | 10 +- .../TStringOpsCopyReturnValueTest.java | 4 +- .../test/strings/TStringOpsCopyTest.java | 4 +- .../TStringOpsIndexOfAnyConstantTest.java | 12 +- .../TStringOpsIndexOfAnyRangeTest.java | 4 +- .../strings/TStringOpsIndexOfAnyTest.java | 4 +- .../strings/TStringOpsIndexOfTableTest.java | 4 +- ...gOpsIndexOfTwoConsecutiveConstantTest.java | 12 +- .../TStringOpsIndexOfTwoConsecutiveTest.java | 4 +- ...ringOpsRegionEqualsConstantLengthTest.java | 20 +- ...ringOpsRegionEqualsConstantStrideTest.java | 10 +- .../TStringOpsRegionEqualsConstantTest.java | 12 +- .../strings/TStringOpsRegionEqualsTest.java | 4 +- .../truffle/test/strings/TStringOpsTest.java | 10 +- .../truffle/test/strings/TStringTest.java | 31 +- .../test/strings/VectorizedMismatchTest.java | 6 +- .../TRegexCompilerTestDummyLanguage.java | 2 +- .../TRegexTStringVirtualizationTest.java | 12 +- .../graal}/util/test/AddModulesTest.java | 4 +- .../graal}/util/test/CollectionSizeTest.java | 4 +- .../graal}/util/test/CollectionUtilTest.java | 4 +- .../graal}/util/test/JSONParserTest.java | 8 +- .../graal}/util/test/ObjectSizeEstimate.java | 2 +- .../graal}/util/test/OptionsEncoderTest.java | 8 +- .../api/directives/GraalDirectives.java | 2 +- .../graal}/api/replacements/Fold.java | 2 +- .../graal}/api/replacements/Snippet.java | 2 +- .../SnippetReflectionProvider.java | 2 +- .../replacements/SnippetTemplateCache.java | 2 +- .../api/runtime/GraalJVMCICompiler.java | 2 +- .../graal}/api/runtime/GraalRuntime.java | 2 +- .../compiler/graal}/asm/AbstractAddress.java | 2 +- .../compiler/graal}/asm/AsmOptions.java | 2 +- .../compiler/graal}/asm/Assembler.java | 4 +- .../asm/BranchTargetOutOfBoundsException.java | 4 +- .../compiler/graal}/asm/Buffer.java | 4 +- .../compiler/graal}/asm/Label.java | 4 +- .../compiler/graal}/asm/VectorSize.java | 2 +- .../asm/aarch64/AArch64ASIMDAssembler.java | 20 +- .../aarch64/AArch64ASIMDMacroAssembler.java | 6 +- .../graal}/asm/aarch64/AArch64Address.java | 24 +- .../graal}/asm/aarch64/AArch64Assembler.java | 285 ++- .../asm/aarch64/AArch64MacroAssembler.java | 39 +- .../graal}/asm/aarch64/ASIMDKind.java | 4 +- .../graal}/asm/amd64/AMD64Address.java | 6 +- .../graal}/asm/amd64/AMD64Assembler.java | 1618 ++++++++--------- .../graal}/asm/amd64/AMD64BaseAssembler.java | 93 +- .../graal}/asm/amd64/AMD64MacroAssembler.java | 231 ++- .../compiler/graal}/asm/amd64/AVXKind.java | 16 +- .../graal}/bytecode/BridgeMethodUtils.java | 12 +- .../compiler/graal}/bytecode/Bytecode.java | 2 +- .../graal}/bytecode/BytecodeDisassembler.java | 110 +- .../graal}/bytecode/BytecodeLookupSwitch.java | 2 +- .../graal}/bytecode/BytecodeProvider.java | 2 +- .../graal}/bytecode/BytecodeStream.java | 2 +- .../graal}/bytecode/BytecodeSwitch.java | 2 +- .../graal}/bytecode/BytecodeTableSwitch.java | 2 +- .../compiler/graal}/bytecode/Bytecodes.java | 24 +- .../compiler/graal}/bytecode/Bytes.java | 2 +- .../compiler/graal}/bytecode/OWNERS.toml | 0 .../bytecode/ResolvedJavaMethodBytecode.java | 2 +- .../ResolvedJavaMethodBytecodeProvider.java | 2 +- .../graal}/code/CompilationResult.java | 10 +- .../compiler/graal}/code/DataSection.java | 12 +- .../graal}/code/DisassemblerProvider.java | 4 +- .../compiler/graal}/code/HexCodeFile.java | 14 +- .../code/HexCodeFileDisassemblerProvider.java | 6 +- .../code/ObjdumpDisassemblerProvider.java | 16 +- .../compiler/graal}/code/SourceMapping.java | 4 +- .../SourceStackTraceBailoutException.java | 4 +- .../graal}/core/CompilationPrinter.java | 21 +- .../graal}/core/CompilationWatchDog.java | 20 +- .../graal}/core/CompilationWrapper.java | 60 +- .../compiler/graal}/core/CompilerThread.java | 4 +- .../graal}/core/CompilerThreadFactory.java | 2 +- .../compiler/graal}/core/GraalCompiler.java | 58 +- .../graal}/core/GraalCompilerOptions.java | 14 +- .../graal}/core/GraalServiceThread.java | 8 +- .../compiler/graal}/core/Instrumentation.java | 2 +- .../graal}/core/LIRGenerationPhase.java | 34 +- .../aarch64/AArch64AddressLoweringByUse.java | 26 +- .../core/aarch64/AArch64AddressNode.java | 30 +- .../AArch64ArithmeticLIRGenerator.java | 85 +- .../AArch64BarrierSetLIRGenerator.java | 12 +- .../core/aarch64/AArch64LIRGenerator.java | 150 +- .../core/aarch64/AArch64LIRKindTool.java | 8 +- .../aarch64/AArch64LoweringProviderMixin.java | 10 +- .../core/aarch64/AArch64MoveFactory.java | 26 +- .../core/aarch64/AArch64NodeLIRBuilder.java | 10 +- .../core/aarch64/AArch64NodeMatchRules.java | 92 +- .../core/aarch64/AArch64PointerAddNode.java | 34 +- .../core/aarch64/AArch64SuitesCreator.java | 8 +- .../core/amd64/AMD64AddressLowering.java | 32 +- .../graal}/core/amd64/AMD64AddressNode.java | 40 +- .../amd64/AMD64ArithmeticLIRGenerator.java | 250 +-- .../amd64/AMD64BarrierSetLIRGenerator.java | 10 +- .../amd64/AMD64CompressAddressLowering.java | 36 +- .../graal}/core/amd64/AMD64LIRGenerator.java | 210 +-- .../graal}/core/amd64/AMD64LIRKindTool.java | 8 +- .../amd64/AMD64LoweringProviderMixin.java | 34 +- .../graal}/core/amd64/AMD64MoveFactory.java | 36 +- .../core/amd64/AMD64MoveFactoryBase.java | 14 +- .../core/amd64/AMD64NodeLIRBuilder.java | 32 +- .../core/amd64/AMD64NodeMatchRules.java | 155 +- .../graal}/core/amd64/AMD64SuitesCreator.java | 22 +- .../core/amd64/UseTrappingDivPhase.java | 60 +- .../common/BootstrapMethodIntrospection.java | 2 +- .../common/CancellationBailoutException.java | 2 +- .../core/common/CompilationIdentifier.java | 2 +- .../common/CompilationListenerProfiler.java | 10 +- .../common/CompilationRequestIdentifier.java | 2 +- .../graal}/core/common/CompilerProfiler.java | 2 +- .../graal}/core/common/CompressEncoding.java | 2 +- .../core/common/FieldIntrospection.java | 2 +- .../compiler/graal}/core/common/Fields.java | 6 +- .../graal}/core/common/FieldsScanner.java | 4 +- .../core/common/GraalBailoutException.java | 4 +- .../graal}/core/common/GraalOptions.java | 10 +- .../compiler/graal}/core/common/LIRKind.java | 4 +- .../graal}/core/common/LIRKindWithCast.java | 2 +- .../compiler/graal}/core/common/NumUtil.java | 2 +- .../common/PermanentBailoutException.java | 2 +- .../common/RetryableBailoutException.java | 2 +- .../core/common/SpectrePHTMitigations.java | 14 +- .../compiler/graal}/core/common/Stride.java | 4 +- .../graal}/core/common/StrideUtil.java | 14 +- .../core/common/SuppressFBWarnings.java | 2 +- .../core/common/SuppressSVMWarnings.java | 2 +- .../common/alloc/BasicBlockOrderUtils.java | 8 +- .../alloc/DefaultCodeEmissionOrder.java | 19 +- .../core/common/alloc/LinearScanOrder.java | 13 +- .../alloc/RegisterAllocationConfig.java | 4 +- .../core/common/calc/CanonicalCondition.java | 4 +- .../graal}/core/common/calc/Condition.java | 6 +- .../graal}/core/common/calc/FloatConvert.java | 12 +- .../common/calc/FloatConvertCategory.java | 2 +- .../core/common/calc/ReinterpretUtils.java | 10 +- .../graal}/core/common/calc/UnsignedMath.java | 2 +- .../common/cfg/AbstractControlFlowGraph.java | 2 +- .../graal}/core/common/cfg/BasicBlock.java | 26 +- .../graal}/core/common/cfg/BasicBlockSet.java | 2 +- .../graal}/core/common/cfg/BlockMap.java | 2 +- .../graal}/core/common/cfg/CFGVerifier.java | 2 +- .../core/common/cfg/CodeEmissionOrder.java | 4 +- .../cfg/DominatorOptimizationProblem.java | 2 +- .../compiler/graal}/core/common/cfg/Loop.java | 4 +- .../core/common/cfg/PropertyConsumable.java | 2 +- ...itigateSpeculativeExecutionAttacksHelp.txt | 0 .../common/doc-files/TraceInliningHelp.txt | 0 .../core/common/memory/BarrierType.java | 2 +- .../core/common/memory/MemoryExtendKind.java | 10 +- .../core/common/memory/MemoryOrderMode.java | 2 +- .../core/common/spi/CodeGenProviders.java | 2 +- .../common/spi/ConstantFieldProvider.java | 4 +- .../common/spi/ForeignCallDescriptor.java | 2 +- .../core/common/spi/ForeignCallLinkage.java | 2 +- .../core/common/spi/ForeignCallSignature.java | 4 +- .../core/common/spi/ForeignCallsProvider.java | 4 +- .../common/spi/JavaConstantFieldProvider.java | 8 +- .../graal}/core/common/spi/LIRKindTool.java | 4 +- .../spi/MetaAccessExtensionProvider.java | 2 +- .../core/common/type/AbstractObjectStamp.java | 2 +- .../common/type/AbstractPointerStamp.java | 2 +- .../core/common/type/ArithmeticOpTable.java | 60 +- .../core/common/type/ArithmeticStamp.java | 2 +- .../common/type/CompressibleConstant.java | 2 +- .../core/common/type/DataPointerConstant.java | 2 +- .../graal}/core/common/type/FloatStamp.java | 72 +- .../graal}/core/common/type/IllegalStamp.java | 8 +- .../graal}/core/common/type/IntegerStamp.java | 86 +- .../graal}/core/common/type/ObjectStamp.java | 6 +- .../core/common/type/PrimitiveStamp.java | 4 +- .../core/common/type/RawPointerStamp.java | 8 +- .../graal}/core/common/type/Stamp.java | 10 +- .../graal}/core/common/type/StampFactory.java | 6 +- .../graal}/core/common/type/StampPair.java | 2 +- .../common/type/SymbolicJVMCIReference.java | 2 +- .../core/common/type/TypeReference.java | 2 +- .../core/common/type/TypedConstant.java | 2 +- .../graal}/core/common/type/VoidStamp.java | 8 +- .../core/common/util/AbstractTypeReader.java | 2 +- .../graal}/core/common/util/BitMap2D.java | 2 +- .../core/common/util/CompilationAlarm.java | 18 +- .../graal}/core/common/util/EventCounter.java | 2 +- .../graal}/core/common/util/FieldKey.java | 2 +- .../core/common/util/FrequencyEncoder.java | 2 +- .../graal}/core/common/util/IntList.java | 2 +- .../graal}/core/common/util/MethodKey.java | 2 +- .../graal}/core/common/util/PhasePlan.java | 2 +- .../graal}/core/common/util/ReversedList.java | 2 +- .../core/common/util/TypeConversion.java | 2 +- .../graal}/core/common/util/TypeReader.java | 2 +- .../graal}/core/common/util/TypeWriter.java | 2 +- .../common/util/UnsafeArrayTypeReader.java | 4 +- .../common/util/UnsafeArrayTypeWriter.java | 18 +- .../graal}/core/common/util/UnsignedLong.java | 2 +- .../graal}/core/common/util/Util.java | 4 +- .../CompilationFailureActionHelp.txt | 0 .../graal}/core/gen/BytecodeParserTool.java | 2 +- .../graal}/core/gen/DebugInfoBuilder.java | 40 +- .../graal}/core/gen/InstructionPrinter.java | 18 +- .../graal}/core/gen/LIRCompilerBackend.java | 72 +- .../core/gen/LIRGenerationProvider.java | 26 +- .../graal}/core/gen/NodeLIRBuilder.java | 162 +- .../graal}/core/gen/NodeMatchRules.java | 88 +- .../graal}/core/gen/package-info.java | 2 +- .../graal}/core/match/ComplexMatchResult.java | 5 +- .../graal}/core/match/ComplexMatchValue.java | 6 +- .../graal}/core/match/MatchContext.java | 88 +- .../graal}/core/match/MatchGenerator.java | 4 +- .../graal}/core/match/MatchPattern.java | 22 +- .../compiler/graal}/core/match/MatchRule.java | 4 +- .../graal}/core/match/MatchRuleRegistry.java | 27 +- .../graal}/core/match/MatchRules.java | 2 +- .../graal}/core/match/MatchStatement.java | 24 +- .../graal}/core/match/MatchStatementSet.java | 6 +- .../graal}/core/match/MatchableNode.java | 4 +- .../graal}/core/match/MatchableNodes.java | 2 +- .../compiler/graal}/core/package-info.java | 4 +- .../compiler/graal}/core/phases/BaseTier.java | 22 +- .../graal}/core/phases/CEOptimization.java | 63 +- .../CommunityCompilerConfiguration.java | 24 +- .../phases/EconomyCompilerConfiguration.java | 32 +- .../graal}/core/phases/EconomyHighTier.java | 8 +- .../graal}/core/phases/EconomyLowTier.java | 20 +- .../graal}/core/phases/EconomyMidTier.java | 18 +- .../compiler/graal}/core/phases/HighTier.java | 76 +- .../compiler/graal}/core/phases/LowTier.java | 46 +- .../compiler/graal}/core/phases/MidTier.java | 86 +- .../fuzzing/AbstractCompilationPlan.java | 22 +- .../core/phases/fuzzing/AbstractTierPlan.java | 11 +- .../fuzzing/FullFuzzedCompilationPlan.java | 10 +- .../phases/fuzzing/FullFuzzedTierPlan.java | 8 +- .../core/phases/fuzzing/FuzzedSuites.java | 12 +- .../fuzzing/MinimalFuzzedCompilationPlan.java | 14 +- .../phases/fuzzing/MinimalFuzzedTierPlan.java | 16 +- .../phases/fuzzing/PhasePlanSerializer.java | 16 +- .../riscv64/RISCV64LoweringProviderMixin.java | 8 +- .../core/riscv64/RISCV64NodeMatchRules.java | 6 +- .../core/riscv64/RISCV64ReflectionUtil.java | 2 +- .../graal}/core/riscv64/ShadowedRISCV64.java | 2 +- .../compiler/graal}/core/target/Backend.java | 40 +- .../compiler/graal}/debug/AbstractKey.java | 2 +- .../compiler/graal}/debug/AccumulatedKey.java | 2 +- .../compiler/graal}/debug/Assertions.java | 10 +- .../compiler/graal}/debug/CSVUtil.java | 2 +- .../debug/CausableByCompilerAssert.java | 2 +- .../graal}/debug/CloseableCounter.java | 2 +- .../graal}/debug/CompilationListener.java | 4 +- .../compiler/graal}/debug/CounterKey.java | 2 +- .../compiler/graal}/debug/CounterKeyImpl.java | 2 +- .../compiler/graal}/debug/DebugCloseable.java | 2 +- .../compiler/graal}/debug/DebugConfig.java | 6 +- .../graal}/debug/DebugConfigImpl.java | 8 +- .../compiler/graal}/debug/DebugContext.java | 50 +- .../graal}/debug/DebugDumpHandler.java | 2 +- .../compiler/graal}/debug/DebugDumpScope.java | 2 +- .../compiler/graal}/debug/DebugFilter.java | 4 +- .../compiler/graal}/debug/DebugHandler.java | 2 +- .../graal}/debug/DebugHandlersFactory.java | 6 +- .../compiler/graal}/debug/DebugOptions.java | 26 +- .../graal}/debug/DebugVerifyHandler.java | 2 +- .../debug/DiagnosticsOutputDirectory.java | 8 +- .../compiler/graal}/debug/GlobalMetrics.java | 6 +- .../compiler/graal}/debug/GraalError.java | 2 +- .../compiler/graal}/debug/IgvDumpChannel.java | 14 +- .../compiler/graal}/debug/Indent.java | 2 +- .../graal}/debug/JavaMethodContext.java | 2 +- .../compiler/graal}/debug/KeyRegistry.java | 2 +- .../compiler/graal}/debug/LogStream.java | 2 +- .../graal}/debug/MemUseTrackerKey.java | 4 +- .../graal}/debug/MemUseTrackerKeyImpl.java | 4 +- .../compiler/graal}/debug/MethodFilter.java | 2 +- .../compiler/graal}/debug/MetricKey.java | 2 +- .../compiler/graal}/debug/PathUtilities.java | 6 +- .../graal}/debug/PathUtilitiesProvider.java | 8 +- .../compiler/graal}/debug/ScopeImpl.java | 6 +- .../debug/StandardPathUtilitiesProvider.java | 2 +- .../compiler/graal}/debug/TTY.java | 6 +- .../graal}/debug/TTYStreamProvider.java | 2 +- .../compiler/graal}/debug/TimeSource.java | 4 +- .../compiler/graal}/debug/TimerKey.java | 2 +- .../compiler/graal}/debug/TimerKeyImpl.java | 4 +- .../compiler/graal}/debug/Versions.java | 2 +- .../graal}/debug/doc-files/DumpHelp.txt | 0 .../debug/doc-files/MethodFilterHelp.txt | 8 +- .../debug/doc-files/MetricsFileHelp.txt | 0 .../debug/doc-files/OptimizationLogHelp.txt | 0 .../graal}/debug/doc-files/PrintGraphHelp.txt | 0 .../compiler/graal}/graph/Edges.java | 14 +- .../graal}/graph/GraalGraphError.java | 6 +- .../compiler/graal}/graph/Graph.java | 36 +- .../graal}/graph/GraphNodeIterator.java | 2 +- .../compiler/graal}/graph/InputEdges.java | 10 +- .../graal}/graph/IterableNodeType.java | 2 +- .../compiler/graal}/graph/LinkedStack.java | 4 +- .../graal}/graph/MemoryKillMarker.java | 11 +- .../compiler/graal}/graph/Node.java | 58 +- .../compiler/graal}/graph/NodeBitMap.java | 6 +- .../compiler/graal}/graph/NodeClass.java | 87 +- .../compiler/graal}/graph/NodeFlood.java | 4 +- .../compiler/graal}/graph/NodeIdAccessor.java | 2 +- .../compiler/graal}/graph/NodeInputList.java | 10 +- .../compiler/graal}/graph/NodeList.java | 8 +- .../compiler/graal}/graph/NodeMap.java | 2 +- .../graal}/graph/NodeSourcePosition.java | 12 +- .../compiler/graal}/graph/NodeStack.java | 2 +- .../graal}/graph/NodeSuccessorList.java | 10 +- .../compiler/graal}/graph/NodeUnionFind.java | 2 +- .../graal}/graph/NodeUsageIterable.java | 8 +- .../graal}/graph/NodeUsageIterator.java | 2 +- .../graph/NodeUsageWithModCountIterator.java | 2 +- .../compiler/graal}/graph/NodeWorkList.java | 4 +- .../compiler/graal}/graph/Position.java | 4 +- .../graal}/graph/SourceLanguagePosition.java | 2 +- .../graph/SourceLanguagePositionProvider.java | 2 +- .../compiler/graal}/graph/SuccessorEdges.java | 6 +- .../graal}/graph/TypedGraphNodeIterator.java | 4 +- .../graph/iterators/FilteredNodeIterable.java | 4 +- .../graal}/graph/iterators/NodeIterable.java | 4 +- .../graal}/graph/iterators/NodeIterator.java | 4 +- .../graal}/graph/iterators/NodePredicate.java | 7 +- .../graph/iterators/NodePredicates.java | 4 +- .../PredicatedProxyNodeIterator.java | 4 +- .../compiler/graal}/graph/package-info.java | 2 +- .../graph/spi/BinaryCommutativeMarker.java | 6 +- .../graph/spi/CanonicalizableMarker.java | 6 +- .../graal}/graph/spi/NodeWithIdentity.java | 4 +- .../graal}/graph/spi/SimplifiableMarker.java | 6 +- .../graal}/graphio/DefaultGraphBlocks.java | 2 +- .../graal}/graphio/DefaultGraphTypes.java | 2 +- .../compiler/graal}/graphio/GraphBlocks.java | 2 +- .../graal}/graphio/GraphElements.java | 2 +- .../graal}/graphio/GraphJavadocSnippets.java | 18 +- .../graal}/graphio/GraphLocations.java | 2 +- .../compiler/graal}/graphio/GraphOutput.java | 2 +- .../graal}/graphio/GraphProtocol.java | 2 +- .../graal}/graphio/GraphStructure.java | 2 +- .../compiler/graal}/graphio/GraphTypes.java | 7 +- .../compiler/graal}/graphio/ProtocolImpl.java | 2 +- .../graal}/graphio/doc-files/diamond.png | Bin .../compiler/graal}/graphio/package-info.java | 45 +- .../graal}/hightiercodegen/CodeBuffer.java | 6 +- .../graal}/hightiercodegen/CodeGenTool.java | 24 +- .../graal}/hightiercodegen/Emitter.java | 6 +- .../graal}/hightiercodegen/IEmitter.java | 2 +- .../graal}/hightiercodegen/Keyword.java | 2 +- .../graal}/hightiercodegen/NodeLowerer.java | 172 +- .../irwalk/BasicBlockInterpreter.java | 36 +- .../irwalk/BlockNestingVerifier.java | 2 +- .../irwalk/BlockVisitHistory.java | 4 +- .../irwalk/IRWalkVerifier.java | 16 +- .../hightiercodegen/irwalk/IRWalker.java | 24 +- .../irwalk/StackifierIRWalker.java | 80 +- .../lowerer/CommitAllocationLowerer.java | 16 +- .../hightiercodegen/lowerer/MoveResolver.java | 8 +- .../lowerer/PhiResolveLowerer.java | 12 +- .../reconstruction/ReconstructionData.java | 4 +- .../reconstruction/ReconstructionPhase.java | 6 +- .../ScheduleWithReconstructionResult.java | 4 +- .../reconstruction/StackifierData.java | 26 +- .../stackifier/CFStackifierSortPhase.java | 45 +- .../StackifierReconstructionPhase.java | 24 +- .../StackifierScopeComputation.java | 40 +- .../stackifier/blocks/LabeledBlock.java | 4 +- .../blocks/LabeledBlockGeneration.java | 36 +- .../scopes/CatchScopeContainer.java | 6 +- .../stackifier/scopes/IfScopeContainer.java | 7 +- .../stackifier/scopes/LoopScopeContainer.java | 7 +- .../stackifier/scopes/Scope.java | 9 +- .../stackifier/scopes/ScopeContainer.java | 2 +- .../scopes/SwitchScopeContainer.java | 7 +- .../variables/ResolvedVar.java | 4 +- .../variables/VariableAllocation.java | 34 +- .../variables/VariableMap.java | 4 +- .../graal}/hotspot/BootstrapWatchDog.java | 20 +- ...CommunityCompilerConfigurationFactory.java | 12 +- .../graal}/hotspot/CompilationContext.java | 4 +- .../graal}/hotspot/CompilationCounters.java | 14 +- .../graal}/hotspot/CompilationStatistics.java | 12 +- .../graal}/hotspot/CompilationTask.java | 62 +- ...leTheWorldFuzzedSuitesCompilationTask.java | 12 +- .../hotspot/CompilerConfigurationFactory.java | 30 +- .../hotspot/DefaultInstrumentation.java | 4 +- .../EconomyCompilerConfigurationFactory.java | 12 +- .../graal}/hotspot/EncodedSnippets.java | 60 +- .../graal}/hotspot/GraalHotSpotVMConfig.java | 14 +- .../hotspot/GraalHotSpotVMConfigAccess.java | 15 +- .../graal}/hotspot/HotSpotBackend.java | 194 +- .../graal}/hotspot/HotSpotBackendFactory.java | 62 +- .../graal}/hotspot/HotSpotBytecodeParser.java | 20 +- .../hotspot/HotSpotCodeCacheListener.java | 2 +- .../hotspot/HotSpotCompilationIdentifier.java | 8 +- .../hotspot/HotSpotCompiledCodeBuilder.java | 30 +- .../graal}/hotspot/HotSpotCounterOp.java | 24 +- .../graal}/hotspot/HotSpotDataBuilder.java | 10 +- .../hotspot/HotSpotDebugInfoBuilder.java | 32 +- .../hotspot/HotSpotForeignCallLinkage.java | 10 +- .../HotSpotForeignCallLinkageImpl.java | 21 +- .../graal}/hotspot/HotSpotGraalCompiler.java | 69 +- .../hotspot/HotSpotGraalCompilerFactory.java | 22 +- .../HotSpotGraalJVMCIServiceLocator.java | 4 +- .../hotspot/HotSpotGraalOptionValues.java | 14 +- .../graal}/hotspot/HotSpotGraalRuntime.java | 68 +- .../hotspot/HotSpotGraalRuntimeProvider.java | 24 +- .../graal}/hotspot/HotSpotGraalServices.java | 2 +- .../hotspot/HotSpotGraalVMEventListener.java | 10 +- .../hotspot/HotSpotGraphBuilderInstance.java | 16 +- .../hotspot/HotSpotGraphBuilderPhase.java | 12 +- .../graal}/hotspot/HotSpotHostBackend.java | 62 +- .../hotspot/HotSpotLIRGenerationResult.java | 18 +- .../graal}/hotspot/HotSpotLIRGenerator.java | 10 +- .../graal}/hotspot/HotSpotLockStack.java | 16 +- .../graal}/hotspot/HotSpotMarkId.java | 6 +- .../graal}/hotspot/HotSpotNodeLIRBuilder.java | 12 +- .../hotspot/HotSpotReferenceMapBuilder.java | 18 +- .../hotspot/HotSpotReplacementsImpl.java | 61 +- .../HotSpotSnippetMetaAccessProvider.java | 2 +- .../hotspot/HotSpotTTYStreamProvider.java | 26 +- .../graal}/hotspot/HotSpotZBarrierSet.java | 14 +- .../graal}/hotspot/IsGraalPredicate.java | 4 +- .../graal}/hotspot/IsGraalPredicateBase.java | 2 +- .../graal}/hotspot/JFRCompilerProfiler.java | 6 +- .../graal}/hotspot/JVMCICompilerShadow.java | 2 +- .../graal}/hotspot/JVMCIVersionCheck.java | 2 +- .../graal}/hotspot/JVMCIVersionCompare.java | 2 +- .../graal}/hotspot/ProfileReplaySupport.java | 67 +- .../graal}/hotspot/SnippetObjectConstant.java | 2 +- .../hotspot/SnippetResolvedJavaMethod.java | 2 +- .../hotspot/SnippetResolvedJavaType.java | 4 +- .../graal}/hotspot/SnippetSignature.java | 2 +- .../hotspot/SymbolicSnippetEncoder.java | 178 +- .../aarch64/AArch64HotSpotBackend.java | 90 +- .../aarch64/AArch64HotSpotBackendFactory.java | 58 +- .../AArch64HotSpotCRuntimeCallEpilogueOp.java | 14 +- .../AArch64HotSpotCRuntimeCallPrologueOp.java | 16 +- .../aarch64/AArch64HotSpotCounterOp.java | 30 +- .../AArch64HotSpotDeoptimizeCallerOp.java | 19 +- .../aarch64/AArch64HotSpotDeoptimizeOp.java | 23 +- ...otSpotDeoptimizeWithExceptionCallerOp.java | 18 +- .../AArch64HotSpotDirectStaticCallOp.java | 22 +- .../AArch64HotSpotDirectVirtualCallOp.java | 22 +- .../aarch64/AArch64HotSpotEpilogueOp.java | 33 +- .../AArch64HotSpotForeignCallsProvider.java | 27 +- ...tSpotJumpToExceptionHandlerInCallerOp.java | 14 +- .../aarch64/AArch64HotSpotLIRGenerator.java | 102 +- .../AArch64HotSpotLoweringProvider.java | 38 +- .../aarch64/AArch64HotSpotMacroAssembler.java | 6 +- .../hotspot/aarch64/AArch64HotSpotMove.java | 28 +- .../aarch64/AArch64HotSpotMoveFactory.java | 6 +- .../aarch64/AArch64HotSpotNodeLIRBuilder.java | 60 +- .../AArch64HotSpotPatchReturnAddressOp.java | 16 +- ...Arch64HotSpotRegisterAllocationConfig.java | 4 +- .../aarch64/AArch64HotSpotReturnOp.java | 18 +- .../aarch64/AArch64HotSpotSafepointOp.java | 30 +- .../AArch64HotSpotStrategySwitchOp.java | 20 +- .../aarch64/AArch64HotSpotSuitesCreator.java | 14 +- .../aarch64/AArch64HotSpotUnwindOp.java | 22 +- .../AArch64HotSpotZAtomicReadAndWriteOp.java | 18 +- ...AArch64HotSpotZBarrierSetLIRGenerator.java | 60 +- .../aarch64/AArch64HotSpotZBarrieredOp.java | 20 +- .../AArch64HotSpotZCompareAndSwapOp.java | 22 +- .../aarch64/AArch64HotSpotZReadBarrierOp.java | 24 +- .../aarch64/AArch64IndirectCallOp.java | 20 +- .../hotspot/amd64/AMD64DeoptimizeOp.java | 20 +- .../amd64/AMD64HotSpotAddressLowering.java | 54 +- .../hotspot/amd64/AMD64HotSpotBackend.java | 86 +- .../amd64/AMD64HotSpotBackendFactory.java | 48 +- .../AMD64HotSpotCRuntimeCallEpilogueOp.java | 14 +- .../AMD64HotSpotCRuntimeCallPrologueOp.java | 14 +- .../hotspot/amd64/AMD64HotSpotCounterOp.java | 30 +- .../amd64/AMD64HotSpotDeoptimizeCallerOp.java | 17 +- ...otSpotDeoptimizeWithExceptionCallerOp.java | 18 +- .../amd64/AMD64HotSpotDirectStaticCallOp.java | 22 +- .../amd64/AMD64HotSpotEpilogueBlockEndOp.java | 20 +- .../AMD64HotSpotForeignCallsProvider.java | 77 +- .../hotspot/amd64/AMD64HotSpotFrameMap.java | 8 +- .../amd64/AMD64HotSpotFrameMapBuilder.java | 6 +- .../amd64/AMD64HotSpotIndirectCallOp.java | 20 +- ...tSpotJumpToExceptionHandlerInCallerOp.java | 12 +- .../amd64/AMD64HotSpotLIRGenerator.java | 100 +- .../amd64/AMD64HotSpotLIRKindTool.java | 6 +- .../amd64/AMD64HotSpotLoweringProvider.java | 49 +- .../amd64/AMD64HotSpotMacroAssembler.java | 12 +- .../amd64/AMD64HotSpotMathIntrinsicOp.java | 18 +- .../hotspot/amd64/AMD64HotSpotMove.java | 30 +- .../amd64/AMD64HotSpotMoveFactory.java | 8 +- .../amd64/AMD64HotSpotNodeLIRBuilder.java | 58 +- .../AMD64HotSpotPatchReturnAddressOp.java | 16 +- .../AMD64HotSpotPushInterpreterFrameOp.java | 18 +- .../AMD64HotSpotRegisterAllocationConfig.java | 4 +- .../amd64/AMD64HotSpotRestoreRbpOp.java | 2 +- .../hotspot/amd64/AMD64HotSpotReturnOp.java | 37 +- .../amd64/AMD64HotSpotSafepointOp.java | 32 +- .../amd64/AMD64HotSpotStrategySwitchOp.java | 16 +- .../amd64/AMD64HotSpotSuitesCreator.java | 14 +- .../hotspot/amd64/AMD64HotSpotUnwindOp.java | 24 +- .../AMD64HotSpotZAtomicReadAndWriteOp.java | 18 +- .../AMD64HotSpotZBarrierSetLIRGenerator.java | 66 +- .../amd64/AMD64HotSpotZBarrieredOp.java | 22 +- .../amd64/AMD64HotSpotZCompareAndSwapOp.java | 24 +- .../amd64/AMD64HotSpotZReadBarrierOp.java | 22 +- .../AMD64HotSpotZVectorReadBarrierOp.java | 32 +- .../AMD64HotspotDirectVirtualCallOp.java | 22 +- .../graal}/hotspot/amd64/AMD64MathStub.java | 22 +- .../graal}/hotspot/amd64/AMD64TailcallOp.java | 12 +- .../amd64/AMD64X87MathIntrinsicNode.java | 42 +- .../hotspot/amd64/AMD64X87MathSnippets.java | 38 +- .../hotspot/debug/BenchmarkCounters.java | 28 +- .../AbortOnBenchmarkCounterOverflowHelp.txt | 0 .../BenchmarkDynamicCountersHelp.txt | 0 .../hotspot/lir/HotSpotZapRegistersPhase.java | 30 +- .../lir/VerifyMaxRegisterSizePhase.java | 16 +- .../AddressLoweringHotSpotSuitesProvider.java | 18 +- .../meta/DefaultHotSpotLoweringProvider.java | 330 ++-- .../meta/HotSpotConstantFieldProvider.java | 8 +- .../meta/HotSpotDisassemblerProvider.java | 10 +- .../meta/HotSpotExceptionDispatchPlugin.java | 52 +- .../meta/HotSpotForeignCallDescriptor.java | 8 +- .../meta/HotSpotForeignCallsProvider.java | 4 +- .../meta/HotSpotForeignCallsProviderImpl.java | 66 +- .../meta/HotSpotFuzzedSuitesProvider.java | 14 +- .../HotSpotGraalConstantFieldProvider.java | 10 +- .../meta/HotSpotGraphBuilderPlugins.java | 260 ++- .../meta/HotSpotHostForeignCallsProvider.java | 360 ++-- .../meta/HotSpotInvocationPluginProvider.java | 9 +- .../meta/HotSpotInvocationPlugins.java | 28 +- .../HotSpotJITClassInitializationPlugin.java | 24 +- .../meta/HotSpotLoadedSuitesProvider.java | 10 +- .../hotspot/meta/HotSpotLoweringProvider.java | 16 +- .../HotSpotMetaAccessExtensionProvider.java | 4 +- .../hotspot/meta/HotSpotNodePlugin.java | 24 +- .../HotSpotPlatformConfigurationProvider.java | 8 +- .../graal}/hotspot/meta/HotSpotProviders.java | 30 +- .../graal}/hotspot/meta/HotSpotRegisters.java | 2 +- .../meta/HotSpotRegistersProvider.java | 2 +- .../HotSpotSnippetReflectionProvider.java | 14 +- .../hotspot/meta/HotSpotStampProvider.java | 12 +- .../hotspot/meta/HotSpotSuitesProvider.java | 60 +- .../meta/HotSpotWordOperationPlugin.java | 66 +- .../meta/UnimplementedGraalIntrinsics.java | 6 +- .../hotspot/nodes/AcquiredCASLockNode.java | 20 +- .../graal}/hotspot/nodes/AllocaNode.java | 24 +- .../hotspot/nodes/BeginLockScopeNode.java | 32 +- .../hotspot/nodes/CurrentJavaThreadNode.java | 26 +- .../graal}/hotspot/nodes/CurrentLockNode.java | 26 +- .../hotspot/nodes/DeoptimizeCallerNode.java | 20 +- .../DeoptimizeWithExceptionInCallerNode.java | 26 +- .../hotspot/nodes/DeoptimizingStubCall.java | 14 +- .../hotspot/nodes/EndLockScopeNode.java | 22 +- .../nodes/FastAcquireBiasedLockNode.java | 20 +- .../hotspot/nodes/HotSpotCompressionNode.java | 26 +- .../nodes/HotSpotDirectCallTargetNode.java | 12 +- .../nodes/HotSpotIndirectCallTargetNode.java | 12 +- .../HotSpotLoadReservedReferenceNode.java | 40 +- .../HotSpotStoreReservedReferenceNode.java | 36 +- .../JumpToExceptionHandlerInCallerNode.java | 26 +- .../nodes/JumpToExceptionHandlerNode.java | 26 +- .../nodes/KlassBeingInitializedCheckNode.java | 18 +- .../hotspot/nodes/LoadIndexedPointerNode.java | 14 +- .../hotspot/nodes/MonitorCounterNode.java | 26 +- .../hotspot/nodes/PatchReturnAddressNode.java | 24 +- .../hotspot/nodes/StubForeignCallNode.java | 40 +- .../graal}/hotspot/nodes/StubStartNode.java | 14 +- .../graal}/hotspot/nodes/VMErrorNode.java | 30 +- .../nodes/VirtualThreadUpdateJFRNode.java | 26 +- .../nodes/type/HotSpotNarrowOopStamp.java | 16 +- .../hotspot/nodes/type/KlassPointerStamp.java | 12 +- .../nodes/type/MetaspacePointerStamp.java | 12 +- .../type/MethodCountersPointerStamp.java | 6 +- .../nodes/type/MethodPointerStamp.java | 6 +- .../compiler/graal}/hotspot/package-info.java | 2 +- .../phases/OnStackReplacementPhase.java | 104 +- .../replacements/AssertionSnippets.java | 52 +- .../replacements/CallSiteTargetNode.java | 22 +- .../hotspot/replacements/ClassGetHubNode.java | 56 +- .../replacements/DigestBaseSnippets.java | 38 +- .../hotspot/replacements/FastNotifyNode.java | 28 +- .../HotSpotAllocationSnippets.java | 184 +- .../HotSpotG1WriteBarrierSnippets.java | 62 +- .../replacements/HotSpotHashCodeSnippets.java | 30 +- .../HotSpotIdentityHashCodeNode.java | 14 +- .../HotSpotInvocationPluginHelper.java | 74 +- .../replacements/HotSpotIsArraySnippets.java | 14 +- .../HotSpotReflectionGetCallerClassNode.java | 8 +- .../replacements/HotSpotReplacementsUtil.java | 68 +- .../HotSpotSerialWriteBarrierSnippets.java | 26 +- .../replacements/HotspotSnippetsOptions.java | 13 +- .../hotspot/replacements/HubGetClassNode.java | 34 +- .../replacements/InstanceOfSnippets.java | 96 +- .../replacements/KlassLayoutHelperNode.java | 40 +- .../LoadExceptionObjectSnippets.java | 56 +- .../graal}/hotspot/replacements/Log.java | 22 +- .../hotspot/replacements/LogSnippets.java | 34 +- .../hotspot/replacements/MonitorSnippets.java | 239 ++- .../hotspot/replacements/ObjectCloneNode.java | 62 +- .../replacements/ObjectCloneSnippets.java | 24 +- .../hotspot/replacements/ObjectSnippets.java | 56 +- .../RegisterFinalizerSnippets.java | 43 +- .../replacements/StringToBytesSnippets.java | 42 +- .../replacements/TypeCheckSnippetUtils.java | 55 +- .../replacements/UnsafeCopyMemoryNode.java | 26 +- .../hotspot/replacements/UnsafeSnippets.java | 37 +- .../VirtualThreadUpdateJFRSnippets.java | 68 +- .../arraycopy/CheckcastArrayCopyCallNode.java | 62 +- .../arraycopy/GenericArrayCopyCallNode.java | 39 +- .../arraycopy/HotSpotArraycopySnippets.java | 30 +- .../ProfileAllocationsContextHelp.txt | 0 .../riscv64/RISCV64HotSpotBackendFactory.java | 66 +- .../RISCV64HotSpotForeignCallsProvider.java | 26 +- .../RISCV64HotSpotLoweringProvider.java | 34 +- .../riscv64/RISCV64HotSpotSuitesCreator.java | 14 +- .../stubs/AbstractForeignCallStub.java | 74 +- .../stubs/ArrayStoreExceptionStub.java | 18 +- .../hotspot/stubs/ClassCastExceptionStub.java | 18 +- .../hotspot/stubs/CreateExceptionStub.java | 63 +- .../stubs/DivisionByZeroExceptionStub.java | 18 +- .../hotspot/stubs/ExceptionHandlerStub.java | 84 +- .../hotspot/stubs/ForeignCallSnippets.java | 59 +- .../graal}/hotspot/stubs/ForeignCallStub.java | 41 +- .../graal}/hotspot/stubs/HotSpotGraphKit.java | 38 +- ...mentExceptionArgumentIsNotAnArrayStub.java | 20 +- .../IntegerExactOverflowExceptionStub.java | 18 +- .../graal}/hotspot/stubs/IntrinsicStubs.java | 56 +- .../hotspot/stubs/InvokeJavaMethodStub.java | 52 +- .../stubs/LongExactOverflowExceptionStub.java | 18 +- .../stubs/NegativeArraySizeExceptionStub.java | 22 +- .../stubs/NullPointerExceptionStub.java | 14 +- .../stubs/OutOfBoundsExceptionStub.java | 33 +- .../graal}/hotspot/stubs/SnippetStub.java | 36 +- .../compiler/graal}/hotspot/stubs/Stub.java | 72 +- .../stubs/StubCompilationIdentifier.java | 6 +- .../graal}/hotspot/stubs/StubOptions.java | 8 +- .../graal}/hotspot/stubs/StubUtil.java | 31 +- .../stubs/UnwindExceptionToCallerStub.java | 69 +- .../graal}/hotspot/stubs/VerifyOopStub.java | 16 +- .../graal}/hotspot/word/HotSpotOperation.java | 2 +- .../graal}/hotspot/word/HotSpotWordTypes.java | 12 +- .../graal}/hotspot/word/KlassPointer.java | 14 +- .../graal}/hotspot/word/MetaspacePointer.java | 14 +- .../hotspot/word/MethodCountersPointer.java | 6 +- .../graal}/hotspot/word/MethodPointer.java | 8 +- .../graal}/hotspot/word/PointerCastNode.java | 30 +- .../compiler/graal}/java/BciBlockMapping.java | 444 ++--- .../compiler/graal}/java/BytecodeParser.java | 772 ++++---- .../graal}/java/BytecodeParserOptions.java | 8 +- .../graal}/java/DefaultSuitesCreator.java | 18 +- .../graal}/java/FrameStateBuilder.java | 88 +- .../graal}/java/GraphBuilderPhase.java | 21 +- .../graal}/java/JsrNotSupportedBailout.java | 4 +- .../compiler/graal}/java/JsrScope.java | 6 +- .../compiler/graal}/java/LambdaUtils.java | 29 +- .../graal}/java/LargeLocalLiveness.java | 10 +- .../compiler/graal}/java/LocalLiveness.java | 114 +- .../graal}/java/SmallLocalLiveness.java | 4 +- .../java/StableMethodNameFormatter.java | 20 +- .../graal}/java/SuitesProviderBase.java | 16 +- .../BailoutAndRestartBackendException.java | 4 +- .../compiler/graal}/lir/CastValue.java | 2 +- .../compiler/graal}/lir/CompositeValue.java | 11 +- .../graal}/lir/CompositeValueClass.java | 28 +- .../graal}/lir/ComputeCodeEmissionOrder.java | 16 +- .../compiler/graal}/lir/ConstantValue.java | 2 +- .../graal}/lir/ControlFlowOptimizer.java | 19 +- .../graal}/lir/EdgeMoveOptimizer.java | 16 +- .../compiler/graal}/lir/FullInfopointOp.java | 4 +- .../compiler/graal}/lir/GenerateStub.java | 16 +- .../compiler/graal}/lir/GenerateStubs.java | 2 +- .../graal}/lir/GeneratedStubsHolder.java | 5 +- .../graal}/lir/ImplicitLIRFrameState.java | 2 +- .../graal}/lir/InstructionStateProcedure.java | 2 +- .../graal}/lir/InstructionValueConsumer.java | 6 +- .../graal}/lir/InstructionValueProcedure.java | 7 +- .../compiler/graal}/lir/LIR.java | 24 +- .../compiler/graal}/lir/LIRFrameState.java | 10 +- .../graal}/lir/LIRInsertionBuffer.java | 2 +- .../compiler/graal}/lir/LIRInstruction.java | 38 +- .../graal}/lir/LIRInstructionClass.java | 18 +- .../graal}/lir/LIRInstructionVerifier.java | 2 +- .../compiler/graal}/lir/LIRIntrospection.java | 20 +- .../compiler/graal}/lir/LIRValueUtil.java | 10 +- .../compiler/graal}/lir/LabelRef.java | 10 +- .../graal}/lir/NullCheckOptimizer.java | 12 +- .../compiler/graal}/lir/Opcode.java | 2 +- .../graal}/lir/RedundantMoveElimination.java | 26 +- .../compiler/graal}/lir/StandardOp.java | 27 +- .../compiler/graal}/lir/StateProcedure.java | 2 +- .../compiler/graal}/lir/SwitchStrategy.java | 10 +- .../compiler/graal}/lir/SyncPort.java | 4 +- .../compiler/graal}/lir/SyncPorts.java | 2 +- .../compiler/graal}/lir/ValueConsumer.java | 6 +- .../compiler/graal}/lir/ValueProcedure.java | 6 +- .../compiler/graal}/lir/Variable.java | 2 +- .../compiler/graal}/lir/VirtualStackSlot.java | 2 +- .../lir/aarch64/AArch64AESDecryptOp.java | 44 +- .../lir/aarch64/AArch64AESEncryptOp.java | 34 +- .../lir/aarch64/AArch64AcrossVectorOp.java | 18 +- .../lir/aarch64/AArch64AddressValue.java | 31 +- .../lir/aarch64/AArch64ArithmeticOp.java | 34 +- .../lir/aarch64/AArch64ArrayCompareToOp.java | 30 +- .../AArch64ArrayCopyWithConversionsOp.java | 50 +- .../lir/aarch64/AArch64ArrayEqualsOp.java | 56 +- .../lir/aarch64/AArch64ArrayIndexOfOp.java | 44 +- .../AArch64ArrayRegionCompareToOp.java | 44 +- .../graal}/lir/aarch64/AArch64AtomicMove.java | 30 +- .../aarch64/AArch64BigIntegerMulAddOp.java | 32 +- .../AArch64BigIntegerMultiplyToLenOp.java | 26 +- .../AArch64BigIntegerSquareToLenOp.java | 27 +- .../graal}/lir/aarch64/AArch64BitFieldOp.java | 14 +- .../lir/aarch64/AArch64BitManipulationOp.java | 20 +- .../graal}/lir/aarch64/AArch64BitSwapOp.java | 16 +- .../graal}/lir/aarch64/AArch64BlockEndOp.java | 12 +- .../lir/aarch64/AArch64BreakpointOp.java | 18 +- .../graal}/lir/aarch64/AArch64ByteSwap.java | 16 +- .../lir/aarch64/AArch64CacheWritebackOp.java | 10 +- .../AArch64CacheWritebackPostSyncOp.java | 8 +- .../AArch64CalcStringAttributesOp.java | 78 +- .../graal}/lir/aarch64/AArch64Call.java | 28 +- ...Arch64CipherBlockChainingAESDecryptOp.java | 36 +- ...Arch64CipherBlockChainingAESEncryptOp.java | 36 +- .../graal}/lir/aarch64/AArch64Compare.java | 34 +- .../lir/aarch64/AArch64ComplexVectorOp.java | 22 +- .../lir/aarch64/AArch64ControlFlow.java | 50 +- .../graal}/lir/aarch64/AArch64Convert.java | 16 +- .../lir/aarch64/AArch64CountPositivesOp.java | 60 +- .../aarch64/AArch64CounterModeAESCryptOp.java | 32 +- .../lir/aarch64/AArch64EncodeArrayOp.java | 40 +- .../aarch64/AArch64FloatToHalfFloatOp.java | 24 +- .../graal}/lir/aarch64/AArch64FrameMap.java | 6 +- .../lir/aarch64/AArch64FrameMapBuilder.java | 6 +- .../aarch64/AArch64GHASHProcessBlocksOp.java | 34 +- .../aarch64/AArch64HalfFloatToFloatOp.java | 16 +- .../graal}/lir/aarch64/AArch64HaltOp.java | 10 +- .../graal}/lir/aarch64/AArch64LIRFlags.java | 4 +- .../lir/aarch64/AArch64LIRInstruction.java | 10 +- .../graal}/lir/aarch64/AArch64MD5Op.java | 32 +- .../lir/aarch64/AArch64MathCopySignOp.java | 14 +- .../aarch64/AArch64MathIntrinsicBinaryOp.java | 12 +- .../lir/aarch64/AArch64MathSignumOp.java | 20 +- .../graal}/lir/aarch64/AArch64Move.java | 60 +- .../AArch64NormalizedUnsignedCompareOp.java | 16 +- .../graal}/lir/aarch64/AArch64PauseOp.java | 10 +- .../graal}/lir/aarch64/AArch64PermuteOp.java | 18 +- .../graal}/lir/aarch64/AArch64PrefetchOp.java | 12 +- .../aarch64/AArch64ReadTimestampCounter.java | 12 +- .../lir/aarch64/AArch64ReinterpretOp.java | 8 +- .../aarch64/AArch64RestoreRegistersOp.java | 16 +- .../aarch64/AArch64RoundFloatToIntegerOp.java | 27 +- .../graal}/lir/aarch64/AArch64SHA1Op.java | 40 +- .../graal}/lir/aarch64/AArch64SHA256Op.java | 39 +- .../graal}/lir/aarch64/AArch64SHA3Op.java | 48 +- .../graal}/lir/aarch64/AArch64SHA512Op.java | 36 +- .../lir/aarch64/AArch64SaveRegistersOp.java | 12 +- .../aarch64/AArch64SpeculativeBarrier.java | 8 +- .../graal}/lir/aarch64/AArch64SpinWaitOp.java | 14 +- .../aarch64/AArch64StringLatin1InflateOp.java | 26 +- .../aarch64/AArch64StringUTF16CompressOp.java | 34 +- .../aarch64/AArch64VectorizedMismatchOp.java | 36 +- .../lir/aarch64/AArch64ZapRegistersOp.java | 10 +- .../graal}/lir/aarch64/AArch64ZapStackOp.java | 10 +- .../lir/aarch64/AArch64ZeroMemoryOp.java | 24 +- .../lir/alloc/AllocationStageVerifier.java | 20 +- .../lir/alloc/OutOfRegistersException.java | 4 +- .../lir/alloc/RegisterAllocationPhase.java | 4 +- .../lir/alloc/SaveCalleeSaveRegisters.java | 26 +- .../graal}/lir/alloc/lsra/Interval.java | 44 +- .../graal}/lir/alloc/lsra/IntervalWalker.java | 12 +- .../graal}/lir/alloc/lsra/LinearScan.java | 69 +- .../alloc/lsra/LinearScanAllocationPhase.java | 18 +- .../lsra/LinearScanAssignLocationsPhase.java | 89 +- .../LinearScanEliminateSpillMovePhase.java | 59 +- .../alloc/lsra/LinearScanIntervalDumper.java | 6 +- .../lsra/LinearScanLifetimeAnalysisPhase.java | 91 +- .../LinearScanOptimizeSpillPositionPhase.java | 31 +- .../lir/alloc/lsra/LinearScanPhase.java | 15 +- .../LinearScanRegisterAllocationPhase.java | 10 +- .../lsra/LinearScanResolveDataFlowPhase.java | 18 +- .../lir/alloc/lsra/LinearScanWalker.java | 43 +- .../graal}/lir/alloc/lsra/MoveResolver.java | 20 +- .../lsra/OptimizingLinearScanWalker.java | 34 +- .../compiler/graal}/lir/alloc/lsra/Range.java | 6 +- .../lir/alloc/lsra/RegisterVerifier.java | 20 +- .../lir/alloc/lsra/ssa/SSALinearScan.java | 24 +- .../SSALinearScanEliminateSpillMovePhase.java | 22 +- .../SSALinearScanLifetimeAnalysisPhase.java | 28 +- .../SSALinearScanResolveDataFlowPhase.java | 28 +- .../lir/alloc/lsra/ssa/SSAMoveResolver.java | 24 +- .../graal}/lir/amd64/AMD64AESDecryptOp.java | 81 +- .../graal}/lir/amd64/AMD64AESEncryptOp.java | 53 +- .../graal}/lir/amd64/AMD64AddressValue.java | 27 +- .../graal}/lir/amd64/AMD64Arithmetic.java | 18 +- .../AMD64ArithmeticLIRGeneratorTool.java | 4 +- .../lir/amd64/AMD64ArrayCompareToOp.java | 50 +- .../AMD64ArrayCopyWithConversionsOp.java | 68 +- .../graal}/lir/amd64/AMD64ArrayEqualsOp.java | 82 +- .../graal}/lir/amd64/AMD64ArrayIndexOfOp.java | 125 +- .../amd64/AMD64ArrayRegionCompareToOp.java | 68 +- .../lir/amd64/AMD64BigIntegerMulAddOp.java | 39 +- .../amd64/AMD64BigIntegerMultiplyToLenOp.java | 39 +- .../amd64/AMD64BigIntegerSquareToLenOp.java | 41 +- .../graal}/lir/amd64/AMD64Binary.java | 76 +- .../graal}/lir/amd64/AMD64BinaryConsumer.java | 66 +- .../graal}/lir/amd64/AMD64BitSwapOp.java | 31 +- .../graal}/lir/amd64/AMD64BlockEndOp.java | 14 +- .../graal}/lir/amd64/AMD64BreakpointOp.java | 15 +- .../graal}/lir/amd64/AMD64ByteSwapOp.java | 12 +- .../lir/amd64/AMD64CacheWritebackOp.java | 13 +- .../amd64/AMD64CacheWritebackPostSyncOp.java | 8 +- .../amd64/AMD64CalcStringAttributesOp.java | 135 +- .../compiler/graal}/lir/amd64/AMD64Call.java | 43 +- .../AMD64CipherBlockChainingAESDecryptOp.java | 45 +- .../AMD64CipherBlockChainingAESEncryptOp.java | 45 +- .../lir/amd64/AMD64ClearRegisterOp.java | 19 +- .../lir/amd64/AMD64ComplexVectorOp.java | 38 +- .../graal}/lir/amd64/AMD64ControlFlow.java | 123 +- .../lir/amd64/AMD64CountPositivesOp.java | 63 +- .../lir/amd64/AMD64CounterModeAESCryptOp.java | 51 +- .../graal}/lir/amd64/AMD64EncodeArrayOp.java | 73 +- .../lir/amd64/AMD64FloatToHalfFloatOp.java | 20 +- .../graal}/lir/amd64/AMD64FrameMap.java | 6 +- .../lir/amd64/AMD64FrameMapBuilder.java | 6 +- .../lir/amd64/AMD64GHASHProcessBlocksOp.java | 41 +- .../lir/amd64/AMD64HalfFloatToFloatOp.java | 15 +- .../graal}/lir/amd64/AMD64HaltOp.java | 10 +- .../graal}/lir/amd64/AMD64LFenceOp.java | 10 +- .../graal}/lir/amd64/AMD64LIRHelper.java | 12 +- .../graal}/lir/amd64/AMD64LIRInstruction.java | 10 +- .../compiler/graal}/lir/amd64/AMD64MD5Op.java | 36 +- .../graal}/lir/amd64/AMD64MathCopySignOp.java | 30 +- .../graal}/lir/amd64/AMD64MathCosOp.java | 24 +- .../graal}/lir/amd64/AMD64MathExpOp.java | 26 +- .../lir/amd64/AMD64MathIntrinsicBinaryOp.java | 12 +- .../lir/amd64/AMD64MathIntrinsicUnaryOp.java | 12 +- .../graal}/lir/amd64/AMD64MathLog10Op.java | 26 +- .../graal}/lir/amd64/AMD64MathLogOp.java | 26 +- .../graal}/lir/amd64/AMD64MathPowOp.java | 26 +- .../graal}/lir/amd64/AMD64MathSignumOp.java | 32 +- .../graal}/lir/amd64/AMD64MathSinOp.java | 24 +- .../graal}/lir/amd64/AMD64MathTanOp.java | 24 +- .../compiler/graal}/lir/amd64/AMD64Move.java | 124 +- .../graal}/lir/amd64/AMD64MulDivOp.java | 45 +- .../AMD64NormalizedUnsignedCompareOp.java | 23 +- .../graal}/lir/amd64/AMD64PauseOp.java | 10 +- .../graal}/lir/amd64/AMD64PrefetchOp.java | 14 +- .../graal}/lir/amd64/AMD64ReadProcid.java | 14 +- .../AMD64ReadTimestampCounterWithProcid.java | 20 +- .../lir/amd64/AMD64RestoreRegistersOp.java | 18 +- .../lir/amd64/AMD64RoundFloatToIntegerOp.java | 32 +- .../graal}/lir/amd64/AMD64SHA1Op.java | 46 +- .../graal}/lir/amd64/AMD64SHA256AVX2Op.java | 48 +- .../graal}/lir/amd64/AMD64SHA256Op.java | 48 +- .../graal}/lir/amd64/AMD64SHA512Op.java | 44 +- .../lir/amd64/AMD64SaveRegistersOp.java | 16 +- .../graal}/lir/amd64/AMD64ShiftOp.java | 23 +- .../graal}/lir/amd64/AMD64SignExtendOp.java | 25 +- .../lir/amd64/AMD64StringLatin1InflateOp.java | 44 +- .../lir/amd64/AMD64StringUTF16CompressOp.java | 53 +- .../graal}/lir/amd64/AMD64Ternary.java | 30 +- .../compiler/graal}/lir/amd64/AMD64Unary.java | 48 +- .../graal}/lir/amd64/AMD64UnaryConsumer.java | 18 +- .../graal}/lir/amd64/AMD64VZeroUpper.java | 17 +- .../lir/amd64/AMD64VectorizedHashCodeOp.java | 91 +- .../lir/amd64/AMD64VectorizedMismatchOp.java | 55 +- .../graal}/lir/amd64/AMD64ZapRegistersOp.java | 12 +- .../graal}/lir/amd64/AMD64ZapStackOp.java | 10 +- .../graal}/lir/amd64/AMD64ZeroMemoryOp.java | 19 +- .../graal}/lir/amd64/EndbranchOp.java | 12 +- .../phases/StackMoveOptimizationPhase.java | 49 +- .../lir/amd64/vector/AMD64VectorBinary.java | 53 +- .../lir/amd64/vector/AMD64VectorBlend.java | 30 +- .../lir/amd64/vector/AMD64VectorClearOp.java | 24 +- .../amd64/vector/AMD64VectorCompareOp.java | 22 +- .../vector/AMD64VectorFloatCompareOp.java | 26 +- .../lir/amd64/vector/AMD64VectorGather.java | 39 +- .../amd64/vector/AMD64VectorInstruction.java | 8 +- .../lir/amd64/vector/AMD64VectorMove.java | 98 +- .../lir/amd64/vector/AMD64VectorShuffle.java | 174 +- .../lir/amd64/vector/AMD64VectorUnary.java | 84 +- .../lir/amd64/vector/AVX512Support.java | 2 +- .../lir/asm/ArrayDataPointerConstant.java | 4 +- .../lir/asm/CompilationResultBuilder.java | 62 +- .../asm/CompilationResultBuilderFactory.java | 26 +- .../compiler/graal}/lir/asm/DataBuilder.java | 10 +- .../graal}/lir/asm/EntryPointDecorator.java | 6 +- .../compiler/graal}/lir/asm/FrameContext.java | 2 +- .../constopt/ConstantLoadOptimization.java | 66 +- .../graal}/lir/constopt/ConstantTree.java | 12 +- .../lir/constopt/ConstantTreeAnalyzer.java | 20 +- .../graal}/lir/constopt/DefUseTree.java | 12 +- .../graal}/lir/constopt/UseEntry.java | 8 +- .../graal}/lir/constopt/VariableMap.java | 4 +- .../graal}/lir/debug/IntervalDumper.java | 2 +- .../lir/debug/LIRGenerationDebugContext.java | 6 +- .../graal}/lir/dfa/LocationMarker.java | 43 +- .../graal}/lir/dfa/LocationMarkerPhase.java | 18 +- .../graal}/lir/dfa/MarkBasePointersPhase.java | 33 +- .../graal}/lir/dfa/RegStackValueSet.java | 23 +- .../graal}/lir/dfa/UniqueWorkList.java | 4 +- .../graal}/lir/framemap/FrameMap.java | 15 +- .../graal}/lir/framemap/FrameMapBuilder.java | 6 +- .../lir/framemap/FrameMapBuilderImpl.java | 29 +- .../lir/framemap/FrameMapBuilderTool.java | 4 +- .../lir/framemap/ReferenceMapBuilder.java | 4 +- .../lir/framemap/SimpleVirtualStackSlot.java | 4 +- .../framemap/SimpleVirtualStackSlotAlias.java | 4 +- .../lir/framemap/VirtualStackSlotRange.java | 6 +- .../lir/gen/ArithmeticLIRGenerator.java | 6 +- .../lir/gen/ArithmeticLIRGeneratorTool.java | 18 +- .../lir/gen/BarrierSetLIRGenerator.java | 2 +- .../lir/gen/BarrierSetLIRGeneratorTool.java | 12 +- .../lir/gen/DiagnosticLIRGeneratorTool.java | 4 +- .../graal}/lir/gen/LIRGenerationResult.java | 18 +- .../compiler/graal}/lir/gen/LIRGenerator.java | 87 +- .../graal}/lir/gen/LIRGeneratorTool.java | 40 +- .../compiler/graal}/lir/gen/MoveFactory.java | 10 +- .../graal}/lir/gen/VerifyingMoveFactory.java | 31 +- .../graal}/lir/hashing/IntHasher.java | 2 +- .../graal}/lir/phases/AllocationPhase.java | 6 +- .../graal}/lir/phases/AllocationStage.java | 19 +- .../lir/phases/EconomyAllocationStage.java | 13 +- .../phases/EconomyFinalCodeAnalysisStage.java | 6 +- ...conomyPostAllocationOptimizationStage.java | 7 +- ...EconomyPreAllocationOptimizationStage.java | 7 +- .../lir/phases/FinalCodeAnalysisPhase.java | 4 +- .../lir/phases/FinalCodeAnalysisStage.java | 8 +- .../compiler/graal}/lir/phases/LIRPhase.java | 22 +- .../graal}/lir/phases/LIRPhaseSuite.java | 14 +- .../compiler/graal}/lir/phases/LIRSuites.java | 26 +- .../PostAllocationOptimizationPhase.java | 6 +- .../PostAllocationOptimizationStage.java | 38 +- .../PreAllocationOptimizationPhase.java | 4 +- .../PreAllocationOptimizationStage.java | 11 +- .../lir/profiling/MethodProfilingPhase.java | 24 +- .../graal}/lir/profiling/MoveProfiler.java | 16 +- .../lir/profiling/MoveProfilingPhase.java | 30 +- .../graal}/lir/profiling/MoveType.java | 12 +- .../compiler/graal}/lir/ssa/SSAUtil.java | 45 +- .../compiler/graal}/lir/ssa/SSAVerifier.java | 35 +- .../FixPointIntervalBuilder.java | 32 +- .../stackslotalloc/LSStackSlotAllocator.java | 60 +- .../SimpleStackSlotAllocator.java | 47 +- .../lir/stackslotalloc/StackInterval.java | 4 +- .../stackslotalloc/StackIntervalDumper.java | 6 +- .../StackSlotAllocatorUtil.java | 10 +- .../graal}/lir/util/GenericValueMap.java | 2 +- .../graal}/lir/util/IndexedValueMap.java | 16 +- .../compiler/graal}/lir/util/RegisterMap.java | 2 +- .../compiler/graal}/lir/util/ValueMap.java | 2 +- .../compiler/graal}/lir/util/ValueSet.java | 2 +- .../phases/ConvertDeoptimizeToGuardPhase.java | 92 +- .../loop/phases/LoopFullUnrollPhase.java | 34 +- .../loop/phases/LoopPartialUnrollPhase.java | 30 +- .../graal}/loop/phases/LoopPeelingPhase.java | 24 +- .../graal}/loop/phases/LoopPhase.java | 10 +- .../loop/phases/LoopPredicationPhase.java | 78 +- .../phases/LoopSafepointEliminationPhase.java | 40 +- .../loop/phases/LoopTransformations.java | 116 +- .../loop/phases/LoopUnswitchingPhase.java | 32 +- .../phases/SpeculativeGuardMovementPhase.java | 108 +- .../compiler/graal}/nodeinfo/InputType.java | 2 +- .../compiler/graal}/nodeinfo/NodeCycles.java | 2 +- .../compiler/graal}/nodeinfo/NodeInfo.java | 9 +- .../compiler/graal}/nodeinfo/NodeSize.java | 2 +- .../graal}/nodeinfo/StructuralInput.java | 2 +- .../compiler/graal}/nodeinfo/Verbosity.java | 2 +- .../graal}/nodes/AbstractBeginNode.java | 28 +- .../graal}/nodes/AbstractDeoptimizeNode.java | 16 +- .../graal}/nodes/AbstractEndNode.java | 18 +- .../graal}/nodes/AbstractFixedGuardNode.java | 28 +- .../graal}/nodes/AbstractLocalNode.java | 16 +- .../graal}/nodes/AbstractMergeNode.java | 34 +- .../graal}/nodes/AbstractStateSplit.java | 10 +- .../graal}/nodes/ArithmeticOperation.java | 6 +- .../compiler/graal}/nodes/BeginNode.java | 20 +- .../graal}/nodes/BeginStateSplitNode.java | 12 +- .../graal}/nodes/BinaryOpLogicNode.java | 14 +- .../compiler/graal}/nodes/BreakpointNode.java | 18 +- .../compiler/graal}/nodes/CallTargetNode.java | 26 +- .../compiler/graal}/nodes/Cancellable.java | 4 +- .../graal}/nodes/CanonicalizableLocation.java | 4 +- .../graal}/nodes/CompanionObjectEncoder.java | 4 +- .../graal}/nodes/CompressionNode.java | 36 +- .../nodes/ComputeObjectAddressNode.java | 18 +- .../graal}/nodes/ConditionAnchorNode.java | 32 +- .../compiler/graal}/nodes/ConstantNode.java | 46 +- .../graal}/nodes/ControlSinkNode.java | 8 +- .../graal}/nodes/ControlSplitNode.java | 13 +- .../compiler/graal}/nodes/DeadEndNode.java | 16 +- .../graal}/nodes/DeoptBciSupplier.java | 2 +- .../compiler/graal}/nodes/DeoptimizeNode.java | 18 +- .../nodes/DeoptimizingFixedWithNextNode.java | 10 +- .../graal}/nodes/DeoptimizingGuard.java | 6 +- .../graal}/nodes/DeoptimizingNode.java | 4 +- .../graal}/nodes/DirectCallTargetNode.java | 8 +- .../graal}/nodes/DynamicDeoptimizeNode.java | 18 +- .../compiler/graal}/nodes/DynamicPiNode.java | 20 +- .../compiler/graal}/nodes/EncodedGraph.java | 8 +- .../compiler/graal}/nodes/EndNode.java | 8 +- .../graal}/nodes/EntryMarkerNode.java | 24 +- .../compiler/graal}/nodes/EntryProxyNode.java | 18 +- .../graal}/nodes/FieldLocationIdentity.java | 2 +- .../compiler/graal}/nodes/FixedGuardNode.java | 41 +- .../compiler/graal}/nodes/FixedNode.java | 8 +- .../graal}/nodes/FixedNodeInterface.java | 2 +- .../graal}/nodes/FixedWithNextNode.java | 8 +- .../nodes/FixedWithNextNodeInterface.java | 2 +- .../graal}/nodes/FloatingAnchoredNode.java | 14 +- .../graal}/nodes/FloatingGuardedNode.java | 16 +- .../compiler/graal}/nodes/FrameState.java | 50 +- .../graal}/nodes/FullInfopointNode.java | 24 +- .../graal}/nodes/GetObjectAddressNode.java | 20 +- .../compiler/graal}/nodes/GraphDecoder.java | 122 +- .../compiler/graal}/nodes/GraphEncoder.java | 41 +- .../compiler/graal}/nodes/GraphState.java | 10 +- .../compiler/graal}/nodes/GuardNode.java | 36 +- .../compiler/graal}/nodes/GuardPhiNode.java | 16 +- .../compiler/graal}/nodes/GuardProxyNode.java | 12 +- .../graal}/nodes/GuardedValueNode.java | 30 +- .../compiler/graal}/nodes/IfNode.java | 104 +- .../graal}/nodes/ImplicitNullCheckNode.java | 8 +- .../graal}/nodes/IndirectCallTargetNode.java | 8 +- .../compiler/graal}/nodes/InliningLog.java | 10 +- .../graal}/nodes/InliningLogCodec.java | 6 +- .../compiler/graal}/nodes/Invokable.java | 6 +- .../compiler/graal}/nodes/Invoke.java | 15 +- .../compiler/graal}/nodes/InvokeNode.java | 54 +- .../graal}/nodes/InvokeWithExceptionNode.java | 46 +- .../graal}/nodes/LIRLowerableLogicNode.java | 14 +- .../graal}/nodes/LogicConstantNode.java | 14 +- .../graal}/nodes/LogicNegationNode.java | 16 +- .../compiler/graal}/nodes/LogicNode.java | 18 +- .../compiler/graal}/nodes/LoopBeginNode.java | 44 +- .../compiler/graal}/nodes/LoopEndNode.java | 28 +- .../compiler/graal}/nodes/LoopExitNode.java | 30 +- .../graal}/nodes/LoweredCallTargetNode.java | 8 +- .../nodes/MemoryMapControlSinkNode.java | 14 +- .../graal}/nodes/MemoryProxyNode.java | 16 +- .../compiler/graal}/nodes/MergeNode.java | 6 +- .../graal}/nodes/NamedLocationIdentity.java | 2 +- .../compiler/graal}/nodes/NodeView.java | 6 +- .../graal}/nodes/OptimizationLog.java | 57 +- .../graal}/nodes/OptimizationLogCodec.java | 8 +- .../graal}/nodes/OptimizationLogImpl.java | 46 +- .../compiler/graal}/nodes/ParameterNode.java | 14 +- .../compiler/graal}/nodes/PauseNode.java | 16 +- .../compiler/graal}/nodes/PhiNode.java | 36 +- .../compiler/graal}/nodes/PiArrayNode.java | 22 +- .../compiler/graal}/nodes/PiNode.java | 58 +- .../nodes/PluginReplacementInterface.java | 10 +- .../graal}/nodes/PluginReplacementNode.java | 20 +- .../PluginReplacementWithExceptionNode.java | 20 +- .../graal}/nodes/PrefetchAllocateNode.java | 26 +- .../compiler/graal}/nodes/ProfileData.java | 2 +- .../compiler/graal}/nodes/ProxyNode.java | 34 +- .../compiler/graal}/nodes/ReturnNode.java | 16 +- .../compiler/graal}/nodes/SafepointNode.java | 18 +- .../graal}/nodes/ShortCircuitOrNode.java | 53 +- .../graal}/nodes/SimplifyingGraphDecoder.java | 56 +- .../graal}/nodes/SnippetAnchorNode.java | 26 +- .../compiler/graal}/nodes/SpinWaitNode.java | 16 +- .../compiler/graal}/nodes/StartNode.java | 14 +- .../compiler/graal}/nodes/StateSplit.java | 4 +- .../graal}/nodes/StaticDeoptimizingNode.java | 4 +- .../graal}/nodes/StructuredGraph.java | 51 +- .../compiler/graal}/nodes/TypeCheckHints.java | 4 +- .../graal}/nodes/UnaryOpLogicNode.java | 16 +- .../graal}/nodes/UnreachableBeginNode.java | 20 +- .../nodes/UnreachableControlSinkNode.java | 14 +- .../graal}/nodes/UnreachableNode.java | 16 +- .../compiler/graal}/nodes/UnwindNode.java | 16 +- .../compiler/graal}/nodes/ValueNode.java | 41 +- .../graal}/nodes/ValueNodeInterface.java | 2 +- .../compiler/graal}/nodes/ValuePhiNode.java | 22 +- .../compiler/graal}/nodes/ValueProxyNode.java | 24 +- .../compiler/graal}/nodes/VirtualState.java | 12 +- .../graal}/nodes/WithExceptionNode.java | 21 +- .../compiler/graal}/nodes/calc/AbsNode.java | 33 +- .../calc/AbstractNormalizeCompareNode.java | 30 +- .../compiler/graal}/nodes/calc/AddNode.java | 34 +- .../compiler/graal}/nodes/calc/AndNode.java | 36 +- .../nodes/calc/BinaryArithmeticNode.java | 52 +- .../graal}/nodes/calc/BinaryNode.java | 14 +- .../graal}/nodes/calc/CompareNode.java | 56 +- .../graal}/nodes/calc/CompressBitsNode.java | 30 +- .../graal}/nodes/calc/ConditionalNode.java | 46 +- .../graal}/nodes/calc/ConvertNode.java | 8 +- .../graal}/nodes/calc/CopySignNode.java | 32 +- .../graal}/nodes/calc/ExpandBitsNode.java | 34 +- .../graal}/nodes/calc/FixedBinaryNode.java | 14 +- .../graal}/nodes/calc/FloatConvertNode.java | 43 +- .../graal}/nodes/calc/FloatDivNode.java | 28 +- .../graal}/nodes/calc/FloatEqualsNode.java | 40 +- .../graal}/nodes/calc/FloatLessThanNode.java | 36 +- .../nodes/calc/FloatNormalizeCompareNode.java | 16 +- .../graal}/nodes/calc/FloatTypeTestNode.java | 28 +- .../nodes/calc/FloatingIntegerDivRemNode.java | 50 +- .../graal}/nodes/calc/FloatingNode.java | 12 +- .../graal}/nodes/calc/IntegerBelowNode.java | 32 +- .../graal}/nodes/calc/IntegerConvertNode.java | 42 +- .../graal}/nodes/calc/IntegerDivRemNode.java | 35 +- .../graal}/nodes/calc/IntegerEqualsNode.java | 44 +- .../nodes/calc/IntegerLessThanNode.java | 44 +- .../nodes/calc/IntegerLowerThanNode.java | 44 +- .../graal}/nodes/calc/IntegerMulHighNode.java | 30 +- .../calc/IntegerNormalizeCompareNode.java | 16 +- .../graal}/nodes/calc/IntegerTestNode.java | 30 +- .../graal}/nodes/calc/IsNullNode.java | 42 +- .../graal}/nodes/calc/LeftShiftNode.java | 32 +- .../compiler/graal}/nodes/calc/MaxNode.java | 26 +- .../graal}/nodes/calc/MinMaxNode.java | 42 +- .../compiler/graal}/nodes/calc/MinNode.java | 26 +- .../compiler/graal}/nodes/calc/MulNode.java | 38 +- .../graal}/nodes/calc/NarrowNode.java | 45 +- .../nodes/calc/NarrowableArithmeticNode.java | 4 +- .../graal}/nodes/calc/NegateNode.java | 37 +- .../compiler/graal}/nodes/calc/NotNode.java | 33 +- .../graal}/nodes/calc/ObjectEqualsNode.java | 56 +- .../compiler/graal}/nodes/calc/OrNode.java | 34 +- .../graal}/nodes/calc/PointerEqualsNode.java | 52 +- .../graal}/nodes/calc/ReinterpretNode.java | 49 +- .../compiler/graal}/nodes/calc/RemNode.java | 28 +- .../graal}/nodes/calc/RightShiftNode.java | 36 +- .../nodes/calc/RoundFloatToIntegerNode.java | 30 +- .../compiler/graal}/nodes/calc/RoundNode.java | 36 +- .../compiler/graal}/nodes/calc/ShiftNode.java | 35 +- .../graal}/nodes/calc/SignExtendNode.java | 39 +- .../graal}/nodes/calc/SignedDivNode.java | 38 +- .../calc/SignedFloatingIntegerDivNode.java | 36 +- .../calc/SignedFloatingIntegerRemNode.java | 36 +- .../graal}/nodes/calc/SignedRemNode.java | 34 +- .../graal}/nodes/calc/SignumNode.java | 32 +- .../compiler/graal}/nodes/calc/SqrtNode.java | 31 +- .../compiler/graal}/nodes/calc/SubNode.java | 32 +- .../graal}/nodes/calc/TernaryNode.java | 21 +- .../nodes/calc/UnaryArithmeticNode.java | 36 +- .../compiler/graal}/nodes/calc/UnaryNode.java | 16 +- .../nodes/calc/UnpackEndianHalfNode.java | 22 +- .../graal}/nodes/calc/UnsignedDivNode.java | 24 +- .../graal}/nodes/calc/UnsignedMaxNode.java | 26 +- .../graal}/nodes/calc/UnsignedMinNode.java | 26 +- .../graal}/nodes/calc/UnsignedRemNode.java | 24 +- .../nodes/calc/UnsignedRightShiftNode.java | 34 +- .../compiler/graal}/nodes/calc/XorNode.java | 36 +- .../graal}/nodes/calc/ZeroExtendNode.java | 41 +- .../graal}/nodes/cfg/ControlFlowGraph.java | 72 +- .../compiler/graal}/nodes/cfg/HIRBlock.java | 56 +- .../compiler/graal}/nodes/cfg/HIRLoop.java | 6 +- .../graal}/nodes/cfg/LocationSet.java | 2 +- .../graal}/nodes/cfg/ReversePostOrder.java | 30 +- .../nodes/debug/BindToRegisterNode.java | 22 +- .../graal}/nodes/debug/BlackholeNode.java | 24 +- .../nodes/debug/ControlFlowAnchorNode.java | 22 +- .../nodes/debug/ControlFlowAnchored.java | 4 +- .../nodes/debug/DynamicCounterNode.java | 36 +- .../nodes/debug/NeverStripMineNode.java | 18 +- .../nodes/debug/NeverWriteSinkNode.java | 18 +- .../graal}/nodes/debug/SideEffectNode.java | 29 +- .../nodes/debug/SpillRegistersNode.java | 20 +- .../graal}/nodes/debug/StringToBytesNode.java | 22 +- .../graal}/nodes/debug/VerifyHeapNode.java | 20 +- .../nodes/extended/AbstractBoxingNode.java | 30 +- .../graal}/nodes/extended/AnchoringNode.java | 4 +- .../nodes/extended/ArrayRangeWrite.java | 12 +- .../graal}/nodes/extended/BoxNode.java | 60 +- .../nodes/extended/BranchProbabilityNode.java | 68 +- .../nodes/extended/BytecodeExceptionNode.java | 46 +- .../nodes/extended/CacheWritebackNode.java | 20 +- .../extended/CacheWritebackSyncNode.java | 18 +- .../nodes/extended/CaptureStateBeginNode.java | 30 +- .../nodes/extended/ClassIsArrayNode.java | 22 +- .../nodes/extended/FixedValueAnchorNode.java | 32 +- .../graal}/nodes/extended/ForeignCall.java | 22 +- .../nodes/extended/ForeignCallNode.java | 38 +- .../graal}/nodes/extended/GetClassNode.java | 36 +- .../graal}/nodes/extended/GuardedNode.java | 4 +- .../nodes/extended/GuardedUnsafeLoadNode.java | 12 +- .../graal}/nodes/extended/GuardingNode.java | 4 +- .../extended/HubGetClassNodeInterface.java | 6 +- .../nodes/extended/IntegerSwitchNode.java | 64 +- .../graal}/nodes/extended/JavaReadNode.java | 42 +- .../graal}/nodes/extended/JavaWriteNode.java | 24 +- .../extended/LoadArrayComponentHubNode.java | 28 +- .../graal}/nodes/extended/LoadHubNode.java | 40 +- .../nodes/extended/LoadHubOrNullNode.java | 40 +- .../graal}/nodes/extended/LoadMethodNode.java | 36 +- .../graal}/nodes/extended/MembarNode.java | 22 +- .../graal}/nodes/extended/MonitorEnter.java | 2 +- .../graal}/nodes/extended/MonitorExit.java | 4 +- .../graal}/nodes/extended/MultiGuardNode.java | 40 +- .../graal}/nodes/extended/NullCheckNode.java | 36 +- .../graal}/nodes/extended/OSRLocalNode.java | 12 +- .../graal}/nodes/extended/OSRLockNode.java | 12 +- .../nodes/extended/OSRMonitorEnterNode.java | 24 +- .../graal}/nodes/extended/OSRStartNode.java | 10 +- .../nodes/extended/ObjectIsArrayNode.java | 32 +- .../nodes/extended/OpaqueGuardNode.java | 18 +- .../nodes/extended/OpaqueLogicNode.java | 18 +- .../graal}/nodes/extended/OpaqueNode.java | 20 +- .../nodes/extended/OpaqueValueNode.java | 22 +- .../graal}/nodes/extended/RawLoadNode.java | 60 +- .../graal}/nodes/extended/RawStoreNode.java | 40 +- .../nodes/extended/StateSplitProxyNode.java | 24 +- .../graal}/nodes/extended/StoreHubNode.java | 18 +- .../extended/SwitchCaseProbabilityNode.java | 22 +- .../graal}/nodes/extended/SwitchNode.java | 54 +- .../graal}/nodes/extended/UnboxNode.java | 36 +- .../nodes/extended/UnsafeAccessNode.java | 34 +- .../graal}/nodes/extended/UnsafeCopyNode.java | 12 +- .../nodes/extended/UnsafeMemoryLoadNode.java | 20 +- .../nodes/extended/UnsafeMemoryStoreNode.java | 20 +- .../nodes/extended/ValueAnchorNode.java | 46 +- .../nodes/gc/ArrayRangeWriteBarrier.java | 18 +- .../compiler/graal}/nodes/gc/BarrierSet.java | 14 +- .../graal}/nodes/gc/CardTableBarrierSet.java | 40 +- .../gc/G1ArrayRangePostWriteBarrier.java | 14 +- .../nodes/gc/G1ArrayRangePreWriteBarrier.java | 14 +- .../graal}/nodes/gc/G1BarrierSet.java | 36 +- .../graal}/nodes/gc/G1PostWriteBarrier.java | 14 +- .../graal}/nodes/gc/G1PreWriteBarrier.java | 20 +- .../nodes/gc/G1ReferentFieldReadBarrier.java | 14 +- .../graal}/nodes/gc/ObjectWriteBarrier.java | 10 +- .../gc/SerialArrayRangeWriteBarrier.java | 14 +- .../graal}/nodes/gc/SerialWriteBarrier.java | 12 +- .../graal}/nodes/gc/WriteBarrier.java | 20 +- .../compiler/graal}/nodes/gc/ZBarrierSet.java | 46 +- .../ClassInitializationPlugin.java | 4 +- .../graphbuilderconf/ForeignCallPlugin.java | 8 +- .../GeneratedFoldInvocationPlugin.java | 2 +- .../GeneratedInvocationPlugin.java | 14 +- ...eneratedNodeIntrinsicInvocationPlugin.java | 4 +- .../GeneratedPluginFactory.java | 2 +- .../GeneratedPluginInjectionProvider.java | 4 +- .../GraphBuilderConfiguration.java | 4 +- .../graphbuilderconf/GraphBuilderContext.java | 111 +- .../graphbuilderconf/GraphBuilderPlugin.java | 2 +- .../graphbuilderconf/GraphBuilderTool.java | 12 +- .../graphbuilderconf/InlineInvokePlugin.java | 8 +- .../graphbuilderconf/IntrinsicContext.java | 24 +- .../graphbuilderconf/InvocationPlugin.java | 12 +- .../InvocationPluginContext.java | 6 +- .../graphbuilderconf/InvocationPlugins.java | 32 +- .../graphbuilderconf/LoopExplosionPlugin.java | 2 +- .../nodes/graphbuilderconf/NodePlugin.java | 16 +- .../graphbuilderconf/ParameterPlugin.java | 6 +- .../nodes/graphbuilderconf/TypePlugin.java | 4 +- .../java/AbstractCompareAndSwapNode.java | 36 +- .../nodes/java/AbstractNewArrayNode.java | 14 +- .../nodes/java/AbstractNewObjectNode.java | 22 +- .../AbstractUnsafeCompareAndSwapNode.java | 58 +- .../graal}/nodes/java/AccessArrayNode.java | 12 +- .../graal}/nodes/java/AccessFieldNode.java | 32 +- .../graal}/nodes/java/AccessIndexedNode.java | 20 +- .../graal}/nodes/java/AccessMonitorNode.java | 28 +- .../graal}/nodes/java/ArrayLengthNode.java | 56 +- .../nodes/java/AtomicReadAndAddNode.java | 22 +- .../nodes/java/AtomicReadAndWriteNode.java | 20 +- .../nodes/java/ClassIsAssignableFromNode.java | 30 +- .../nodes/java/DynamicNewArrayNode.java | 24 +- .../nodes/java/DynamicNewInstanceNode.java | 26 +- .../nodes/java/ExceptionObjectNode.java | 50 +- .../nodes/java/FinalFieldBarrierNode.java | 30 +- .../nodes/java/ForeignCallDescriptors.java | 4 +- .../nodes/java/InstanceOfDynamicNode.java | 34 +- .../graal}/nodes/java/InstanceOfNode.java | 48 +- .../nodes/java/LoadExceptionObjectNode.java | 18 +- .../graal}/nodes/java/LoadFieldNode.java | 68 +- .../graal}/nodes/java/LoadIndexedNode.java | 60 +- .../nodes/java/LogicCompareAndSwapNode.java | 28 +- .../java/LoweredAtomicReadAndAddNode.java | 38 +- .../java/LoweredAtomicReadAndWriteNode.java | 42 +- .../java/LoweredRegisterFinalizerNode.java | 14 +- .../nodes/java/MethodCallTargetNode.java | 50 +- .../graal}/nodes/java/MonitorEnterNode.java | 26 +- .../graal}/nodes/java/MonitorExitNode.java | 28 +- .../graal}/nodes/java/MonitorIdNode.java | 28 +- .../graal}/nodes/java/NewArrayInterface.java | 6 +- .../graal}/nodes/java/NewArrayNode.java | 46 +- .../graal}/nodes/java/NewInstanceNode.java | 24 +- .../graal}/nodes/java/NewMultiArrayNode.java | 28 +- .../nodes/java/ReachabilityFenceNode.java | 40 +- .../nodes/java/RegisterFinalizerNode.java | 44 +- .../graal}/nodes/java/StoreFieldNode.java | 44 +- .../graal}/nodes/java/StoreIndexedNode.java | 52 +- .../graal}/nodes/java/TypeSwitchNode.java | 42 +- .../java/UnsafeCompareAndExchangeNode.java | 18 +- .../nodes/java/UnsafeCompareAndSwapNode.java | 22 +- .../java/ValidateNewInstanceClassNode.java | 26 +- .../nodes/java/ValueCompareAndSwapNode.java | 24 +- .../nodes/loop/BasicInductionVariable.java | 40 +- .../graal}/nodes/loop/CountedLoopInfo.java | 108 +- .../nodes/loop/DefaultLoopPolicies.java | 90 +- .../DerivedConvertedInductionVariable.java | 12 +- .../nodes/loop/DerivedInductionVariable.java | 8 +- .../loop/DerivedOffsetInductionVariable.java | 31 +- .../loop/DerivedScaledInductionVariable.java | 24 +- .../graal}/nodes/loop/InductionVariable.java | 12 +- .../nodes/loop/InductionVariableHelper.java | 12 +- .../compiler/graal}/nodes/loop/LoopEx.java | 109 +- .../graal}/nodes/loop/LoopExpandableNode.java | 4 +- .../graal}/nodes/loop/LoopFragment.java | 60 +- .../graal}/nodes/loop/LoopFragmentInside.java | 116 +- .../nodes/loop/LoopFragmentInsideBefore.java | 6 +- .../nodes/loop/LoopFragmentInsideFrom.java | 6 +- .../graal}/nodes/loop/LoopFragmentWhole.java | 24 +- .../graal}/nodes/loop/LoopPolicies.java | 16 +- .../compiler/graal}/nodes/loop/LoopsData.java | 18 +- .../nodes/loop/LoopsDataProviderImpl.java | 8 +- .../compiler/graal}/nodes/loop/MathUtil.java | 28 +- .../memory/AbstractMemoryCheckpoint.java | 14 +- .../nodes/memory/AbstractWriteNode.java | 30 +- .../nodes/memory/AddressableMemoryAccess.java | 6 +- .../nodes/memory/ExtendableMemoryAccess.java | 10 +- .../graal}/nodes/memory/FixedAccessNode.java | 28 +- .../nodes/memory/FloatableAccessNode.java | 16 +- .../memory/FloatableThreadLocalAccess.java | 4 +- .../nodes/memory/FloatingAccessNode.java | 18 +- .../graal}/nodes/memory/FloatingReadNode.java | 46 +- .../nodes/memory/GuardedMemoryAccess.java | 6 +- .../nodes/memory/LIRLowerableAccess.java | 8 +- .../graal}/nodes/memory/MemoryAccess.java | 6 +- .../graal}/nodes/memory/MemoryAnchorNode.java | 30 +- .../graal}/nodes/memory/MemoryKill.java | 10 +- .../graal}/nodes/memory/MemoryMap.java | 2 +- .../graal}/nodes/memory/MemoryMapNode.java | 28 +- .../graal}/nodes/memory/MemoryPhiNode.java | 26 +- .../graal}/nodes/memory/MultiMemoryKill.java | 2 +- .../nodes/memory/OnHeapMemoryAccess.java | 4 +- .../nodes/memory/OrderedMemoryAccess.java | 4 +- .../graal}/nodes/memory/ReadNode.java | 84 +- .../nodes/memory/SideEffectFreeWriteNode.java | 16 +- .../graal}/nodes/memory/SingleMemoryKill.java | 2 +- .../graal}/nodes/memory/WriteNode.java | 46 +- .../nodes/memory/address/AddressNode.java | 22 +- .../memory/address/IndexAddressNode.java | 17 +- .../memory/address/OffsetAddressNode.java | 38 +- .../nodes/spi/ArithmeticLIRLowerable.java | 4 +- .../graal}/nodes/spi/ArrayLengthProvider.java | 10 +- .../graal}/nodes/spi/Canonicalizable.java | 10 +- .../graal}/nodes/spi/CanonicalizerTool.java | 12 +- .../graal}/nodes/spi/CoreProviders.java | 10 +- .../nodes/spi/CoreProvidersDelegate.java | 10 +- .../nodes/spi/DelegatingReplacements.java | 26 +- .../graal}/nodes/spi/LIRLowerable.java | 2 +- .../graal}/nodes/spi/LimitedValueProxy.java | 4 +- .../graal}/nodes/spi/LoopsDataProvider.java | 8 +- .../compiler/graal}/nodes/spi/Lowerable.java | 4 +- .../graal}/nodes/spi/LoweringProvider.java | 24 +- .../graal}/nodes/spi/LoweringTool.java | 18 +- .../graal}/nodes/spi/MemoryEdgeProxy.java | 4 +- .../graal}/nodes/spi/NodeLIRBuilderTool.java | 48 +- .../graal}/nodes/spi/NodeValueMap.java | 6 +- .../graal}/nodes/spi/NodeWithState.java | 8 +- .../spi/PlatformConfigurationProvider.java | 4 +- .../graal}/nodes/spi/ProfileProvider.java | 2 +- .../compiler/graal}/nodes/spi/Proxy.java | 6 +- .../graal}/nodes/spi/Replacements.java | 30 +- .../ResolvedJavaMethodProfileProvider.java | 2 +- .../graal}/nodes/spi/Simplifiable.java | 10 +- .../graal}/nodes/spi/SimplifierTool.java | 4 +- .../nodes/spi/SnippetParameterInfo.java | 4 +- .../nodes/spi/StableProfileProvider.java | 8 +- .../graal}/nodes/spi/StampInverter.java | 6 +- .../graal}/nodes/spi/StampProvider.java | 8 +- .../graal}/nodes/spi/SwitchFoldable.java | 40 +- .../nodes/spi/UncheckedInterfaceProvider.java | 4 +- .../compiler/graal}/nodes/spi/ValueProxy.java | 4 +- .../graal}/nodes/spi/Virtualizable.java | 2 +- .../nodes/spi/VirtualizableAllocation.java | 2 +- .../graal}/nodes/spi/VirtualizerTool.java | 20 +- .../graal}/nodes/spi/WordVerification.java | 2 +- .../graal}/nodes/type/NarrowOopStamp.java | 16 +- .../compiler/graal}/nodes/type/StampTool.java | 18 +- .../graal}/nodes/util/ConstantFoldUtil.java | 18 +- .../nodes/util/ConstantReflectionUtil.java | 12 +- .../compiler/graal}/nodes/util/GraphUtil.java | 130 +- .../graal}/nodes/util/IntegerHelper.java | 10 +- .../nodes/util/JavaConstantFormattable.java | 2 +- .../nodes/util/JavaConstantFormatter.java | 2 +- .../nodes/util/SignedIntegerHelper.java | 14 +- .../nodes/util/UnsignedIntegerHelper.java | 16 +- .../nodes/virtual/AllocatedObjectNode.java | 28 +- .../nodes/virtual/CommitAllocationNode.java | 56 +- .../nodes/virtual/EnsureVirtualizedNode.java | 44 +- .../nodes/virtual/EscapeObjectState.java | 18 +- .../graal}/nodes/virtual/LockState.java | 4 +- .../virtual/MaterializedObjectState.java | 10 +- .../nodes/virtual/VirtualArrayNode.java | 26 +- .../nodes/virtual/VirtualBoxingNode.java | 14 +- .../nodes/virtual/VirtualInstanceNode.java | 16 +- .../nodes/virtual/VirtualObjectNode.java | 34 +- .../nodes/virtual/VirtualObjectState.java | 12 +- .../graal}/options/EnumMultiOptionKey.java | 2 +- .../graal}/options/EnumOptionKey.java | 2 +- .../ExcludeFromJacocoGeneratedReport.java | 2 +- .../ExcludeFromJacocoInstrumentation.java | 2 +- .../options/ModifiableOptionValues.java | 4 +- .../options/NestedBooleanOptionKey.java | 2 +- .../compiler/graal}/options/OWNERS.toml | 0 .../compiler/graal}/options/Option.java | 2 +- .../graal}/options/OptionDescriptor.java | 2 +- .../graal}/options/OptionDescriptors.java | 2 +- .../graal}/options/OptionDescriptorsMap.java | 2 +- .../compiler/graal}/options/OptionGroup.java | 2 +- .../compiler/graal}/options/OptionKey.java | 4 +- .../graal}/options/OptionStability.java | 2 +- .../compiler/graal}/options/OptionType.java | 2 +- .../compiler/graal}/options/OptionValues.java | 2 +- .../graal}/options/OptionsParser.java | 2 +- .../compiler/graal}/phases/BasePhase.java | 56 +- .../graal}/phases/ClassTypeSequence.java | 2 +- .../graal}/phases/FloatingGuardPhase.java | 2 +- .../compiler/graal}/phases/LazyName.java | 4 +- .../phases/OptimisticOptimizations.java | 6 +- .../compiler/graal}/phases/Phase.java | 4 +- .../compiler/graal}/phases/PhaseSuite.java | 14 +- .../graal}/phases/PlaceholderPhase.java | 8 +- .../graal}/phases/SingleRunSubphase.java | 12 +- .../compiler/graal}/phases/Speculative.java | 4 +- .../compiler/graal}/phases/VerifyPhase.java | 10 +- .../phases/common/AbstractInliningPhase.java | 10 +- .../common/AddressLoweringByNodePhase.java | 18 +- .../common/AddressLoweringByUsePhase.java | 34 +- .../phases/common/AddressLoweringPhase.java | 12 +- .../common/BarrierSetVerificationPhase.java | 16 +- .../phases/common/BoxNodeIdentityPhase.java | 22 +- .../common/BoxNodeOptimizationPhase.java | 22 +- .../phases/common/CanonicalizerPhase.java | 110 +- .../common/ConditionalEliminationPhase.java | 223 ++- .../common/ConditionalEliminationUtil.java | 46 +- .../common/DeadCodeEliminationPhase.java | 24 +- .../common/DeoptimizationGroupingPhase.java | 42 +- .../DisableOverflownCountedLoopsPhase.java | 10 +- ...minatorBasedGlobalValueNumberingPhase.java | 80 +- .../phases/common/ExpandLogicPhase.java | 59 +- .../common/FinalCanonicalizerPhase.java | 10 +- .../graal}/phases/common/FixReadsPhase.java | 112 +- .../phases/common/FloatingReadPhase.java | 92 +- .../common/FrameStateAssignmentPhase.java | 41 +- .../phases/common/GuardLoweringPhase.java | 47 +- .../phases/common/HighTierLoweringPhase.java | 12 +- .../common/IncrementalCanonicalizerPhase.java | 25 +- .../phases/common/InsertGuardFencesPhase.java | 46 +- .../IterativeConditionalEliminationPhase.java | 16 +- .../graal}/phases/common/LazyValue.java | 2 +- .../phases/common/LockEliminationPhase.java | 44 +- .../common/LoopSafepointInsertionPhase.java | 22 +- .../phases/common/LowTierLoweringPhase.java | 12 +- .../graal}/phases/common/LoweringPhase.java | 140 +- .../phases/common/MidTierLoweringPhase.java | 12 +- .../phases/common/OptimizeDivPhase.java | 62 +- .../phases/common/OptimizeExtendsPhase.java | 45 +- .../common/PostRunCanonicalizationPhase.java | 10 +- .../common/ProfileCompiledMethodsPhase.java | 84 +- .../PropagateDeoptimizeProbabilityPhase.java | 26 +- .../RawConditionalEliminationPhase.java | 12 +- .../phases/common/ReassociationPhase.java | 44 +- .../phases/common/RemoveValueProxyPhase.java | 33 +- .../common/SnippetFrameStateAssignment.java | 44 +- .../common/UseTrappingNullChecksPhase.java | 55 +- .../common/UseTrappingOperationPhase.java | 46 +- .../common/VerifyHeapAtReturnPhase.java | 12 +- .../common/WriteBarrierAdditionPhase.java | 18 +- .../phases/common/inlining/InliningPhase.java | 22 +- .../phases/common/inlining/InliningUtil.java | 146 +- .../inlining/info/AbstractInlineInfo.java | 20 +- .../inlining/info/AssumptionInlineInfo.java | 14 +- .../common/inlining/info/ExactInlineInfo.java | 12 +- .../common/inlining/info/InlineInfo.java | 20 +- .../info/MultiTypeGuardInlineInfo.java | 66 +- .../inlining/info/TypeGuardInlineInfo.java | 16 +- .../common/inlining/info/elem/Inlineable.java | 8 +- .../inlining/info/elem/InlineableGraph.java | 51 +- .../policy/AbstractInliningPolicy.java | 14 +- .../inlining/policy/GreedyInliningPolicy.java | 34 +- .../policy/InlineEverythingPolicy.java | 18 +- .../InlineMethodSubstitutionsPolicy.java | 16 +- .../inlining/policy/InliningPolicy.java | 10 +- .../inlining/walker/CallsiteHolder.java | 4 +- .../walker/CallsiteHolderExplorable.java | 24 +- .../walker/ComputeInliningRelevance.java | 40 +- .../common/inlining/walker/InliningData.java | 78 +- .../inlining/walker/InliningIterator.java | 32 +- .../inlining/walker/MethodInvocation.java | 22 +- .../util/EconomicSetNodeEventListener.java | 12 +- .../phases/common/util/LoopUtility.java | 40 +- .../common/util/OptimizationUtility.java | 8 +- .../graal}/phases/contract/NodeCostUtil.java | 24 +- .../phases/contract/PhaseSizeContract.java | 4 +- .../phases/contract/VerifyNodeCosts.java | 14 +- .../FixedNodeRelativeFrequencyCache.java | 34 +- .../graal}/phases/graph/MergeableState.java | 12 +- .../phases/graph/PostOrderNodeIterator.java | 28 +- .../phases/graph/ReentrantBlockIterator.java | 22 +- .../phases/graph/ReentrantNodeIterator.java | 24 +- .../phases/graph/ScheduledNodeIterator.java | 12 +- .../graph/StatelessPostOrderNodeIterator.java | 24 +- .../graal}/phases/graph/package-info.java | 2 +- .../compiler/graal}/phases/package-info.java | 2 +- .../graal}/phases/schedule/BlockClosure.java | 4 +- .../graal}/phases/schedule/SchedulePhase.java | 110 +- .../phases/schedule/ScheduleVerification.java | 61 +- .../phases/tiers/CompilerConfiguration.java | 22 +- .../graal}/phases/tiers/HighTierContext.java | 10 +- .../graal}/phases/tiers/LowTierContext.java | 6 +- .../graal}/phases/tiers/MidTierContext.java | 8 +- .../compiler/graal}/phases/tiers/Suites.java | 16 +- .../graal}/phases/tiers/SuitesCreator.java | 6 +- .../graal}/phases/tiers/SuitesProvider.java | 8 +- .../graal}/phases/tiers/TargetProvider.java | 2 +- .../graal}/phases/util/GraphOrder.java | 69 +- .../graal}/phases/util/Providers.java | 32 +- .../graal}/phases/util/ValueMergeUtil.java | 22 +- .../printer/BciBlockMappingDumpHandler.java | 30 +- .../graal}/printer/BinaryGraphPrinter.java | 84 +- .../compiler/graal}/printer/CFGPrinter.java | 58 +- .../graal}/printer/CFGPrinterObserver.java | 42 +- .../printer/CanonicalStringGraphPrinter.java | 54 +- .../graal}/printer/CompilationPrinter.java | 8 +- .../printer/GraalDebugHandlersFactory.java | 32 +- .../compiler/graal}/printer/GraphPrinter.java | 20 +- .../printer/GraphPrinterDumpHandler.java | 32 +- .../printer/NoDeadCodeVerifyHandler.java | 22 +- .../replacements/AllocationSnippets.java | 35 +- .../replacements/BigIntegerSnippets.java | 14 +- .../graal}/replacements/BoxingSnippets.java | 54 +- .../replacements/CachingPEGraphDecoder.java | 54 +- .../ConstantBindingParameterPlugin.java | 20 +- .../DefaultJavaLoweringProvider.java | 260 +-- .../graal}/replacements/DimensionsNode.java | 26 +- .../graal}/replacements/GraphKit.java | 90 +- .../IdentityHashCodeSnippets.java | 24 +- .../InlineDuringParsingPlugin.java | 20 +- .../InstanceOfSnippetsTemplates.java | 54 +- .../replacements/IntrinsicGraphBuilder.java | 82 +- .../replacements/InvocationPluginHelper.java | 98 +- .../graal}/replacements/IsArraySnippets.java | 34 +- .../graal}/replacements/JavacBug.java | 2 +- .../replacements/MethodHandlePlugin.java | 36 +- .../MethodHandleWithExceptionPlugin.java | 22 +- .../NodeIntrinsificationProvider.java | 20 +- .../graal}/replacements/NodeStrideUtil.java | 22 +- .../replacements/NonNullParameterPlugin.java | 21 +- .../graal}/replacements/PEGraphDecoder.java | 200 +- .../PartialIntrinsicCallTargetNode.java | 18 +- .../graal}/replacements/ReplacementsImpl.java | 117 +- .../graal}/replacements/ReplacementsUtil.java | 10 +- .../graal}/replacements/SnippetCounter.java | 4 +- .../replacements/SnippetCounterNode.java | 48 +- .../replacements/SnippetIntegerHistogram.java | 2 +- .../SnippetSubstitutionInvocationPlugin.java | 16 +- .../replacements/SnippetSubstitutionNode.java | 22 +- .../graal}/replacements/SnippetTemplate.java | 285 +-- .../graal}/replacements/Snippets.java | 4 +- .../StandardGraphBuilderPlugins.java | 348 ++-- .../replacements/StringHelperIntrinsics.java | 2 +- .../replacements/StringLatin1InflateNode.java | 28 +- .../replacements/StringLatin1Snippets.java | 30 +- .../replacements/StringUTF16CompressNode.java | 28 +- .../replacements/StringUTF16Snippets.java | 41 +- .../TargetGraphBuilderPlugins.java | 8 +- .../aarch64/AArch64BitCountNode.java | 14 +- .../aarch64/AArch64GraphBuilderPlugins.java | 116 +- .../AArch64IntegerArithmeticSnippets.java | 62 +- .../amd64/AMD64ConvertSnippets.java | 50 +- .../amd64/AMD64FloatConvertNode.java | 44 +- .../amd64/AMD64GraphBuilderPlugins.java | 130 +- .../amd64/AMD64IntrinsicStubs.java | 20 +- .../arraycopy/ArrayCopyCallNode.java | 64 +- .../arraycopy/ArrayCopyForeignCalls.java | 4 +- .../arraycopy/ArrayCopyLookup.java | 4 +- .../replacements/arraycopy/ArrayCopyNode.java | 25 +- .../arraycopy/ArrayCopySnippets.java | 135 +- .../ArrayCopyWithDelayedLoweringNode.java | 26 +- .../replacements/classfile/Classfile.java | 4 +- .../classfile/ClassfileBytecode.java | 11 +- .../classfile/ClassfileBytecodeProvider.java | 10 +- .../classfile/ClassfileConstant.java | 14 +- .../classfile/ClassfileConstantPool.java | 18 +- .../classfile/ConstantPoolPatch.java | 2 +- .../gc/G1WriteBarrierSnippets.java | 104 +- .../gc/SerialWriteBarrierSnippets.java | 61 +- .../replacements/gc/WriteBarrierSnippets.java | 20 +- .../graal}/replacements/nodes/AESNode.java | 24 +- .../nodes/ArrayCompareToForeignCalls.java | 8 +- .../nodes/ArrayCompareToNode.java | 38 +- .../ArrayCopyWithConversionsForeignCalls.java | 14 +- .../nodes/ArrayCopyWithConversionsNode.java | 34 +- .../nodes/ArrayEqualsForeignCalls.java | 14 +- .../replacements/nodes/ArrayEqualsNode.java | 42 +- .../ArrayEqualsWithMaskForeignCalls.java | 12 +- .../nodes/ArrayIndexOfForeignCalls.java | 10 +- .../nodes/ArrayIndexOfMacroNode.java | 22 +- .../replacements/nodes/ArrayIndexOfNode.java | 46 +- .../ArrayRegionCompareToForeignCalls.java | 10 +- .../nodes/ArrayRegionCompareToNode.java | 41 +- .../nodes/ArrayRegionEqualsNode.java | 41 +- .../nodes/ArrayRegionEqualsWithMaskNode.java | 43 +- .../replacements/nodes/AssertionNode.java | 36 +- .../nodes/BasicArrayCopyNode.java | 58 +- .../nodes/BasicObjectCloneNode.java | 28 +- .../nodes/BigIntegerMulAddNode.java | 24 +- .../nodes/BigIntegerMultiplyToLenNode.java | 24 +- .../nodes/BigIntegerSquareToLenNode.java | 24 +- .../nodes/BinaryMathIntrinsicNode.java | 50 +- .../replacements/nodes/BitCountNode.java | 32 +- .../nodes/BitScanForwardNode.java | 34 +- .../nodes/BitScanReverseNode.java | 34 +- .../replacements/nodes/CStringConstant.java | 18 +- .../CalcStringAttributesForeignCalls.java | 6 +- .../nodes/CalcStringAttributesMacroNode.java | 14 +- .../nodes/CalcStringAttributesNode.java | 22 +- .../nodes/CipherBlockChainingAESNode.java | 26 +- .../nodes/CountLeadingZerosNode.java | 34 +- .../nodes/CountPositivesNode.java | 22 +- .../nodes/CountTrailingZerosNode.java | 34 +- .../nodes/CounterModeAESNode.java | 30 +- .../replacements/nodes/EncodeArrayNode.java | 30 +- .../replacements/nodes/ExplodeLoopNode.java | 22 +- .../FallbackInvokeWithExceptionNode.java | 24 +- .../nodes/FloatToHalfFloatNode.java | 24 +- .../replacements/nodes/ForeignCalls.java | 4 +- .../nodes/FusedMultiplyAddNode.java | 34 +- .../nodes/GHASHProcessBlocksNode.java | 24 +- .../nodes/HalfFloatToFloatNode.java | 24 +- .../nodes/IdentityHashCodeNode.java | 30 +- .../nodes/IntrinsicMethodNodeInterface.java | 18 +- .../nodes/LoadSnippetVarargParameterNode.java | 28 +- .../graal}/replacements/nodes/LogNode.java | 20 +- .../replacements/nodes/MacroInvokable.java | 50 +- .../graal}/replacements/nodes/MacroNode.java | 46 +- .../nodes/MacroWithExceptionNode.java | 45 +- .../nodes/MemoryKillStubIntrinsicNode.java | 18 +- .../replacements/nodes/MessageDigestNode.java | 28 +- .../replacements/nodes/MethodHandleNode.java | 69 +- .../nodes/MethodHandleWithExceptionNode.java | 26 +- .../replacements/nodes/ObjectClone.java | 38 +- .../nodes/ProfileBooleanNode.java | 30 +- .../nodes/PureFunctionMacroNode.java | 16 +- .../nodes/PureFunctionStubIntrinsicNode.java | 16 +- .../replacements/nodes/ReadRegisterNode.java | 28 +- .../nodes/ReflectionGetCallerClassNode.java | 22 +- .../ResolvedMethodHandleCallTargetNode.java | 22 +- .../replacements/nodes/ReverseBitsNode.java | 28 +- .../replacements/nodes/ReverseBytesNode.java | 28 +- .../nodes/UnaryMathIntrinsicNode.java | 44 +- .../nodes/VectorizedHashCodeNode.java | 24 +- .../nodes/VectorizedMismatchNode.java | 20 +- .../nodes/VirtualizableInvokeMacroNode.java | 14 +- .../replacements/nodes/WriteRegisterNode.java | 22 +- .../replacements/nodes/ZeroMemoryNode.java | 32 +- ...BinaryIntegerExactArithmeticSplitNode.java | 14 +- .../nodes/arithmetic/IntegerAddExactNode.java | 36 +- .../IntegerAddExactOverflowNode.java | 30 +- .../arithmetic/IntegerAddExactSplitNode.java | 26 +- .../IntegerExactArithmeticNode.java | 2 +- .../IntegerExactArithmeticSplitNode.java | 22 +- .../arithmetic/IntegerExactOverflowNode.java | 30 +- .../nodes/arithmetic/IntegerMulExactNode.java | 28 +- .../IntegerMulExactOverflowNode.java | 28 +- .../arithmetic/IntegerMulExactSplitNode.java | 26 +- .../nodes/arithmetic/IntegerNegExactNode.java | 32 +- .../IntegerNegExactOverflowNode.java | 34 +- .../arithmetic/IntegerNegExactSplitNode.java | 26 +- .../nodes/arithmetic/IntegerSubExactNode.java | 32 +- .../IntegerSubExactOverflowNode.java | 28 +- .../arithmetic/IntegerSubExactSplitNode.java | 26 +- .../nodes/arithmetic/UnsignedMulHighNode.java | 32 +- .../graal}/runtime/RuntimeProvider.java | 4 +- .../serviceprovider/GlobalAtomicLong.java | 4 +- .../graal}/serviceprovider/GraalServices.java | 4 +- .../serviceprovider/GraalUnsafeAccess.java | 2 +- .../graal}/serviceprovider/IsolateUtil.java | 6 +- .../graal}/serviceprovider/JMXService.java | 2 +- .../serviceprovider/JavaVersionUtil.java | 2 +- .../graal}/serviceprovider/OWNERS.toml | 0 .../serviceprovider/ServiceProvider.java | 2 +- .../SpeculationEncodingAdapter.java | 2 +- .../SpeculationReasonGroup.java | 2 +- .../UnencodedSpeculationReason.java | 2 +- .../compiler/graal}/truffle/OWNERS.toml | 0 .../compiler/AbstractKnownTruffleTypes.java | 4 +- .../AbstractTruffleCompilationSupport.java | 2 +- ...ommunityPartialEvaluatorConfiguration.java | 4 +- .../EconomyPartialEvaluatorConfiguration.java | 4 +- .../truffle/compiler/ExpansionStatistics.java | 81 +- .../compiler/GraphTooBigBailoutException.java | 4 +- .../truffle/compiler/KnownTruffleTypes.java | 2 +- .../PEAgnosticInlineInvokePlugin.java | 12 +- .../compiler/ParsingInlineInvokePlugin.java | 14 +- .../truffle/compiler/PartialEvaluator.java | 88 +- .../PartialEvaluatorConfiguration.java | 10 +- .../PerformanceInformationHandler.java | 65 +- .../compiler/PostPartialEvaluationSuite.java | 26 +- .../truffle/compiler/SuppressFBWarnings.java | 2 +- .../graal}/truffle/compiler/TruffleAST.java | 26 +- .../truffle/compiler/TruffleCompilation.java | 8 +- .../TruffleCompilationIdentifier.java | 4 +- .../TruffleCompilerConfiguration.java | 10 +- .../truffle/compiler/TruffleCompilerImpl.java | 122 +- .../compiler/TruffleCompilerOptions.java | 22 +- .../TruffleConstantFieldProvider.java | 4 +- .../compiler/TruffleDebugHandlersFactory.java | 20 +- .../compiler/TruffleDebugJavaMethod.java | 2 +- .../truffle/compiler/TruffleElementCache.java | 4 +- .../compiler/TruffleInliningScope.java | 8 +- .../TruffleStringConstantFieldProvider.java | 6 +- .../compiler/TruffleTierConfiguration.java | 14 +- .../truffle/compiler/TruffleTierContext.java | 24 +- .../compiler/host/HostInliningPhase.java | 84 +- .../host/InjectImmutableFrameFieldsPhase.java | 22 +- .../compiler/host/TruffleHostEnvironment.java | 10 +- .../compiler/host/TruffleKnownHostTypes.java | 6 +- .../hotspot/HotSpotKnownTruffleTypes.java | 4 +- .../hotspot/HotSpotPartialEvaluator.java | 22 +- .../HotSpotTruffleCompilationIdentifier.java | 6 +- .../HotSpotTruffleCompilationSupport.java | 13 +- .../hotspot/HotSpotTruffleCompilerImpl.java | 116 +- .../HotSpotTruffleGraphBuilderPlugins.java | 22 +- .../HotSpotTruffleHostEnvironment.java | 10 +- .../HotSpotTruffleHostEnvironmentLookup.java | 6 +- .../HotSpotTruffleLoweringExtensions.java | 8 +- ...otSpotTruffleSafepointLoweringSnippet.java | 72 +- ...fleCallBoundaryInstrumentationFactory.java | 12 +- ...TruffleCommunityCompilerConfiguration.java | 18 +- ...CommunityCompilerConfigurationFactory.java | 10 +- .../hotspot/TruffleEntryPointDecorator.java | 20 +- ...fleCallBoundaryInstrumentationFactory.java | 42 +- ...fleCallBoundaryInstrumentationFactory.java | 40 +- .../truffle/compiler/nodes/AnyExtendNode.java | 26 +- .../nodes/IsCompilationConstantNode.java | 30 +- .../nodes/ObjectLocationIdentity.java | 6 +- .../nodes/SpeculativeExceptionAnchorNode.java | 24 +- .../compiler/nodes/TruffleAssumption.java | 2 +- .../compiler/nodes/TruffleSafepointNode.java | 18 +- .../asserts/NeverPartOfCompilationNode.java | 22 +- .../nodes/frame/AllowMaterializeNode.java | 24 +- .../nodes/frame/ForceMaterializeNode.java | 20 +- .../compiler/nodes/frame/NewFrameNode.java | 56 +- .../nodes/frame/VirtualFrameAccessFlags.java | 2 +- .../nodes/frame/VirtualFrameAccessType.java | 2 +- .../VirtualFrameAccessVerificationNode.java | 16 +- .../nodes/frame/VirtualFrameAccessorNode.java | 34 +- .../nodes/frame/VirtualFrameClearNode.java | 26 +- .../nodes/frame/VirtualFrameCopyNode.java | 22 +- .../nodes/frame/VirtualFrameGetNode.java | 48 +- .../nodes/frame/VirtualFrameGetTagNode.java | 28 +- .../nodes/frame/VirtualFrameIsNode.java | 28 +- .../nodes/frame/VirtualFrameSetNode.java | 38 +- .../nodes/frame/VirtualFrameSwapNode.java | 22 +- .../phases/DeoptimizeOnExceptionPhase.java | 16 +- .../phases/FrameAccessVerificationPhase.java | 58 +- .../InliningAcrossTruffleBoundaryPhase.java | 10 +- .../phases/InstrumentBranchesPhase.java | 16 +- .../compiler/phases/InstrumentPhase.java | 50 +- .../InstrumentTruffleBoundariesPhase.java | 18 +- .../compiler/phases/InstrumentationSuite.java | 8 +- .../phases/MaterializeFramesPhase.java | 10 +- .../phases/NeverPartOfCompilationPhase.java | 14 +- .../compiler/phases/PhiTransformPhase.java | 54 +- .../ReportPerformanceWarningsPhase.java | 8 +- .../phases/SetIdentityForValueTypesPhase.java | 12 +- .../phases/TruffleCompilerPhases.java | 16 +- .../TruffleLoopSafepointEliminationPhase.java | 22 +- .../TruffleSafepointInsertionPhase.java | 46 +- .../truffle/compiler/phases/TruffleTier.java | 16 +- .../phases/VerifyFrameDoesNotEscapePhase.java | 16 +- .../inlining/AgnosticInliningPhase.java | 20 +- .../compiler/phases/inlining/CallNode.java | 38 +- .../compiler/phases/inlining/CallTree.java | 16 +- .../inlining/DefaultInliningPolicy.java | 6 +- .../DefaultInliningPolicyProvider.java | 8 +- .../phases/inlining/GraphManager.java | 42 +- .../phases/inlining/InliningPolicy.java | 4 +- .../inlining/InliningPolicyProvider.java | 6 +- .../phases/inlining/NoInliningPolicy.java | 2 +- .../inlining/NoInliningPolicyProvider.java | 8 +- .../inlining/TrivialOnlyInliningPolicy.java | 6 +- .../inlining/TrivialOnlyPolicyProvider.java | 8 +- .../GraphBuilderInvocationPluginProvider.java | 8 +- .../GraphDecoderInvocationPluginProvider.java | 6 +- .../TruffleGraphBuilderPlugins.java | 172 +- .../TruffleInvocationPlugins.java | 60 +- .../compiler/graal}/util/CollectionsUtil.java | 2 +- .../compiler/graal}/util/OptionsEncoder.java | 2 +- .../graal}/util/TypedDataInputStream.java | 2 +- .../graal}/util/TypedDataOutputStream.java | 2 +- .../graal}/util/json/JSONFormatter.java | 2 +- .../compiler/graal}/util/json/JSONParser.java | 2 +- .../graal}/util/json/JSONParserException.java | 2 +- .../graal}/virtual/phases/ea/EffectList.java | 12 +- .../virtual/phases/ea/EffectsBlockState.java | 6 +- .../virtual/phases/ea/EffectsClosure.java | 78 +- .../virtual/phases/ea/EffectsPhase.java | 42 +- .../phases/ea/FinalPartialEscapePhase.java | 18 +- .../virtual/phases/ea/GraphEffectList.java | 48 +- .../graal}/virtual/phases/ea/ObjectState.java | 22 +- .../ea/PEReadEliminationBlockState.java | 22 +- .../phases/ea/PEReadEliminationClosure.java | 74 +- .../phases/ea/PartialEscapeBlockState.java | 34 +- .../phases/ea/PartialEscapeClosure.java | 96 +- .../virtual/phases/ea/PartialEscapePhase.java | 44 +- .../phases/ea/ReadEliminationBlockState.java | 4 +- .../phases/ea/ReadEliminationClosure.java | 78 +- .../phases/ea/ReadEliminationPhase.java | 22 +- .../graal}/virtual/phases/ea/VirtualUtil.java | 22 +- .../phases/ea/VirtualizerToolImpl.java | 44 +- .../compiler/graal}/word/BarrieredAccess.java | 166 +- .../compiler/graal}/word/ObjectAccess.java | 6 +- .../compiler/graal}/word/Word.java | 42 +- .../compiler/graal}/word/WordCastNode.java | 48 +- .../graal}/word/WordOperationPlugin.java | 137 +- .../compiler/graal}/word/WordTypes.java | 27 +- .../graal}/word/WordVerificationImpl.java | 6 +- .../jdk21/test/PreviewEnabledTest.java | 12 +- .../jdk21/test/ScopedValueCacheTest.java | 6 +- .../graal}/management/JMXServiceProvider.java | 8 +- .../ConditionalEliminationBenchmark.java | 10 +- .../FrameStateAssigmentPhaseBenchmark.java | 6 +- .../microbenchmarks/graal/GraalBenchmark.java | 4 +- .../graal/GraphCopyBenchmark.java | 15 +- .../microbenchmarks/graal/NodeBenchmark.java | 22 +- .../graal/SchedulePhaseBenchmark.java | 12 +- .../graal/TestJMHWhitebox.java | 4 +- .../graal/util/FrameStateAssignmentState.java | 8 +- .../graal/util/GraalState.java | 16 +- .../microbenchmarks/graal/util/GraalUtil.java | 22 +- .../graal/util/GraphState.java | 12 +- .../graal/util/MethodSpec.java | 2 +- .../graal/util/NodesState.java | 14 +- .../graal/util/ScheduleState.java | 12 +- .../lir/CompileTimeBenchmark.java | 8 +- .../lir/GraalCompilerState.java | 90 +- .../lir/RegisterAllocationTimeBenchmark.java | 6 +- .../graal}/truffle/test/LoomUtils.java | 2 +- .../virtual/bench/PartialEscapeBench.java | 4 +- .../src/micro/benchmarks/package-info.java | 4 +- .../graalvm/profdiff/test/DeltaTreeTest.java | 2 +- .../profdiff/test/ExperimentPairTest.java | 2 +- .../org/graalvm/profdiff/test/MainTest.java | 2 +- .../src/org/graalvm/profdiff/core/Method.java | 2 +- .../profdiff/core/pair/MethodPair.java | 2 +- .../parser/CompilationUnitTreeParser.java | 2 +- .../profdiff/parser/ExperimentJSONParser.java | 4 +- .../profdiff/parser/ExperimentParser.java | 2 +- docs/reference-manual/java/Operations.md | 18 +- docs/reference-manual/java/compiler.md | 4 +- .../native-image/DebugInfo.md | 2 +- .../ModuleSystemSupportHosted.md | 2 +- substratevm/mx.substratevm/mx_substratevm.py | 14 +- substratevm/mx.substratevm/suite.py | 6 +- .../test/ArrayNewInstancePluginCase.java | 5 +- .../StandaloneConstantScanDynamicTest.java | 8 +- .../test/StandardGraphPluginTest.java | 4 +- .../standalone/MethodConfigReader.java | 6 +- .../pointsto/standalone/PointsToAnalyzer.java | 20 +- .../pointsto/standalone/StandaloneHost.java | 10 +- .../standalone/StandaloneOptions.java | 8 +- .../StandalonePointsToAnalysis.java | 6 +- .../StandaloneAnalysisFeatureImpl.java | 2 +- .../StandaloneAnalysisFeatureManager.java | 8 +- .../heap/StandaloneImageHeapScanner.java | 2 +- .../meta/StandaloneConstantFieldProvider.java | 2 +- .../plugins/StandaloneGraphBuilderPhase.java | 10 +- .../pointsto/AbstractAnalysisEngine.java | 24 +- .../oracle/graal/pointsto/AnalysisPolicy.java | 4 +- .../com/oracle/graal/pointsto/BigBang.java | 10 +- .../graal/pointsto/PointsToAnalysis.java | 18 +- .../com/oracle/graal/pointsto/api/HostVM.java | 18 +- .../graal/pointsto/api/PointstoOptions.java | 6 +- .../flow/ActualParameterTypeFlow.java | 2 +- .../pointsto/flow/AnalysisParsedGraph.java | 36 +- .../pointsto/flow/ArrayCopyTypeFlow.java | 9 +- .../flow/CallSiteSensitiveMethodTypeFlow.java | 2 +- .../graal/pointsto/flow/MethodFlowsGraph.java | 4 +- .../graal/pointsto/flow/MethodTypeFlow.java | 10 +- .../pointsto/flow/MethodTypeFlowBuilder.java | 152 +- .../graal/pointsto/flow/SourceTypeFlow.java | 4 +- .../oracle/graal/pointsto/flow/TypeFlow.java | 2 +- .../flow/builder/TypeFlowBuilder.java | 2 +- .../flow/builder/TypeFlowGraphBuilder.java | 2 +- .../BytecodeSensitiveAnalysisPolicy.java | 2 +- .../pointsto/heap/HeapSnapshotVerifier.java | 6 +- .../pointsto/heap/ImageHeapConstant.java | 4 +- .../graal/pointsto/heap/ImageHeapScanner.java | 8 +- .../infrastructure/GraphProvider.java | 4 +- .../pointsto/infrastructure/Universe.java | 2 +- .../infrastructure/UniverseMetaAccess.java | 2 +- .../infrastructure/WrappedConstantPool.java | 6 +- .../graal/pointsto/meta/AnalysisElement.java | 2 +- .../graal/pointsto/meta/AnalysisField.java | 2 +- .../AnalysisMetaAccessExtensionProvider.java | 4 +- .../graal/pointsto/meta/AnalysisMethod.java | 18 +- .../graal/pointsto/meta/AnalysisType.java | 2 +- .../graal/pointsto/meta/AnalysisUniverse.java | 4 +- .../graal/pointsto/meta/HostedProviders.java | 24 +- .../nodes/AnalysisObjectCloneNode.java | 10 +- .../nodes/UnsafePartitionLoadNode.java | 8 +- .../nodes/UnsafePartitionStoreNode.java | 10 +- .../pointsto/phases/InlineBeforeAnalysis.java | 12 +- .../InlineBeforeAnalysisGraphDecoder.java | 54 +- ...nlineBeforeAnalysisInlineInvokePlugin.java | 6 +- .../phases/InlineBeforeAnalysisPolicy.java | 14 +- .../phases/NoClassInitializationPlugin.java | 6 +- .../SubstrateIntrinsicGraphBuilder.java | 30 +- .../plugins/PointstoGraphBuilderPlugins.java | 16 +- .../pointsto/reports/AnalysisReporter.java | 2 +- .../reports/AnalysisReportsOptions.java | 6 +- .../pointsto/reports/CallTreePrinter.java | 2 +- .../pointsto/reports/ObjectTreePrinter.java | 2 +- .../results/StaticAnalysisResultsBuilder.java | 4 +- .../pointsto/results/StrengthenGraphs.java | 108 +- .../typestate/DefaultAnalysisPolicy.java | 2 +- .../pointsto/typestate/PointsToStats.java | 4 +- .../graal/pointsto/util/AnalysisFuture.java | 2 +- .../pointsto/util/CompletionExecutor.java | 12 +- .../graal/pointsto/util/GraalAccess.java | 12 +- .../pointsto/util/PointsToOptionParser.java | 8 +- .../graal/pointsto/util/TimerCollection.java | 2 +- .../DirectMethodProcessingHandler.java | 42 +- .../MethodSummaryBasedHandler.java | 2 +- .../reachability/MethodSummaryProvider.java | 2 +- .../ReachabilityAnalysisEngine.java | 10 +- .../ReachabilityAnalysisMethod.java | 8 +- .../ReachabilityMethodProcessingHandler.java | 2 +- .../SimpleInMemoryMethodSummaryProvider.java | 42 +- .../src/com/oracle/objectfile/ObjectFile.java | 2 +- .../objectfile/debugentry/ArrayTypeEntry.java | 2 +- .../objectfile/debugentry/ClassEntry.java | 2 +- .../objectfile/debugentry/DebugInfoBase.java | 2 +- .../objectfile/debugentry/EnumClassEntry.java | 2 +- .../debugentry/ForeignTypeEntry.java | 2 +- .../debugentry/HeaderTypeEntry.java | 2 +- .../debugentry/InterfaceClassEntry.java | 2 +- .../debugentry/PrimitiveTypeEntry.java | 2 +- .../debugentry/StructureTypeEntry.java | 2 +- .../objectfile/debugentry/TypeEntry.java | 2 +- .../debuginfo/DebugInfoProvider.java | 2 +- .../elf/dwarf/DwarfARangesSectionImpl.java | 2 +- .../elf/dwarf/DwarfAbbrevSectionImpl.java | 2 +- .../elf/dwarf/DwarfFrameSectionImpl.java | 2 +- .../elf/dwarf/DwarfInfoSectionImpl.java | 2 +- .../elf/dwarf/DwarfLineSectionImpl.java | 2 +- .../elf/dwarf/DwarfLocSectionImpl.java | 2 +- .../elf/dwarf/DwarfRangesSectionImpl.java | 2 +- .../elf/dwarf/DwarfSectionImpl.java | 2 +- .../elf/dwarf/DwarfStrSectionImpl.java | 2 +- .../macho/MachORelocationElement.java | 4 +- .../objectfile/pecoff/cv/CVDebugInfo.java | 4 +- .../pecoff/cv/CVFileTableRecord.java | 2 +- .../objectfile/pecoff/cv/CVSectionImpl.java | 2 +- .../pecoff/cv/CVSymbolSectionImpl.java | 2 +- .../objectfile/pecoff/cv/CVTypeRecord.java | 2 +- .../pecoff/cv/CVTypeSectionBuilder.java | 2 +- .../pecoff/cv/CVTypeSectionImpl.java | 2 +- .../svm/agent/BreakpointInterceptor.java | 2 +- .../svm/common/option/CommonOptionParser.java | 12 +- .../svm/common/option/CommonOptions.java | 4 +- .../config/SerializationConfiguration.java | 2 +- .../PartialConfigurationWithOrigins.java | 2 +- .../filters/FilterConfigurationParser.java | 2 +- .../svm/configure/trace/AccessAdvisor.java | 5 +- .../svm/configure/trace/JniProcessor.java | 2 +- .../svm/configure/trace/LazyValueUtils.java | 2 +- .../configure/trace/ReflectionProcessor.java | 2 +- .../trace/SerializationProcessor.java | 2 +- .../svm/configure/trace/TraceProcessor.java | 2 +- .../com/oracle/svm/core/foreign/AbiUtils.java | 6 +- .../core/foreign/ForeignFunctionsRuntime.java | 2 +- .../genscavenge/AbstractCollectionPolicy.java | 4 +- .../core/genscavenge/AlignedHeapChunk.java | 4 +- .../core/genscavenge/AuxiliaryImageHeap.java | 2 +- .../ChunkedImageHeapAllocator.java | 2 +- .../genscavenge/ChunkedImageHeapLayouter.java | 2 +- .../oracle/svm/core/genscavenge/GCImpl.java | 2 +- .../genscavenge/GreyToBlackObjRefVisitor.java | 2 +- .../svm/core/genscavenge/HeapChunk.java | 4 +- .../oracle/svm/core/genscavenge/HeapImpl.java | 14 +- .../svm/core/genscavenge/HeapParameters.java | 4 +- .../svm/core/genscavenge/HeapVerifier.java | 2 +- .../HostedImageHeapChunkWriter.java | 2 +- .../svm/core/genscavenge/ImageHeapInfo.java | 2 +- .../svm/core/genscavenge/ImageHeapWalker.java | 2 +- .../svm/core/genscavenge/JfrGCEvents.java | 2 +- .../genscavenge/LibGraalCollectionPolicy.java | 2 +- .../core/genscavenge/ObjectHeaderImpl.java | 10 +- .../svm/core/genscavenge/OldGeneration.java | 4 +- .../svm/core/genscavenge/PathExhibitor.java | 2 +- .../core/genscavenge/PinnedObjectImpl.java | 2 +- .../ReferenceObjectProcessing.java | 4 +- .../RuntimeCodeCacheReachabilityAnalyzer.java | 2 +- .../genscavenge/RuntimeCodeCacheWalker.java | 2 +- .../RuntimeImageHeapChunkWriter.java | 2 +- .../SerialAndEpsilonGCOptions.java | 6 +- .../svm/core/genscavenge/SerialGCOptions.java | 8 +- .../oracle/svm/core/genscavenge/Space.java | 10 +- .../genscavenge/ThreadLocalAllocation.java | 6 +- .../core/genscavenge/UnalignedHeapChunk.java | 4 +- .../genscavenge/graal/BarrierSnippets.java | 40 +- .../graal/ForcedSerialPostWriteBarrier.java | 28 +- .../graal/GenScavengeAllocationSnippets.java | 36 +- .../graal/GenScavengeAllocationSupport.java | 4 +- .../graal/GenScavengeGCFeature.java | 6 +- .../graal/SubstrateCardTableBarrierSet.java | 4 +- .../graal/SubstrateNoBarrierSet.java | 12 +- .../graal/nodes/FormatArrayNode.java | 18 +- .../graal/nodes/FormatObjectNode.java | 18 +- .../graal/nodes/FormatPodNode.java | 18 +- .../nodes/FormatStoredContinuationNode.java | 16 +- .../remset/AlignedChunkRememberedSet.java | 6 +- .../core/genscavenge/remset/CardTable.java | 6 +- .../remset/CardTableBasedRememberedSet.java | 2 +- .../genscavenge/remset/NoRememberedSet.java | 2 +- .../genscavenge/remset/RememberedSet.java | 2 +- .../remset/UnalignedChunkRememberedSet.java | 4 +- .../AArch64CGlobalDataLoadAddressOp.java | 12 +- .../aarch64/AArch64CalleeSavedRegisters.java | 8 +- .../graal/aarch64/AArch64FarReturnOp.java | 20 +- ...64InstructionSynchronizationBarrierOp.java | 8 +- .../AArch64LoadMethodPointerConstantOp.java | 14 +- .../AArch64NativePatchConsumerFactory.java | 8 +- .../aarch64/AArch64SafepointCheckOp.java | 14 +- .../AArch64SubstrateSuitesCreator.java | 8 +- .../aarch64/SubstrateAArch64Backend.java | 170 +- .../aarch64/SubstrateAArch64Feature.java | 14 +- .../SubstrateAArch64GraphBuilderPlugins.java | 20 +- .../SubstrateAArch64LoweringProvider.java | 18 +- .../SubstrateAArch64RegisterConfig.java | 2 +- ...SubstrateAArch64SuitesCreatorProvider.java | 2 +- .../amd64/AMD64CGlobalDataLoadAddressOp.java | 12 +- .../amd64/AMD64CalleeSavedRegisters.java | 26 +- .../core/graal/amd64/AMD64FarReturnOp.java | 20 +- .../AMD64LoadMethodPointerConstantOp.java | 14 +- .../graal/amd64/AMD64NativeImagePatcher.java | 8 +- .../svm/core/graal/amd64/AMD64ReturnOp.java | 16 +- .../graal/amd64/AMD64SafepointCheckOp.java | 14 +- .../amd64/AMD64SubstrateSuitesCreator.java | 8 +- .../amd64/SubstrateAMD64AddressLowering.java | 14 +- .../graal/amd64/SubstrateAMD64Backend.java | 184 +- .../graal/amd64/SubstrateAMD64Feature.java | 14 +- .../SubstrateAMD64GraphBuilderPlugins.java | 20 +- .../amd64/SubstrateAMD64LoweringProvider.java | 14 +- .../amd64/SubstrateAMD64RegisterConfig.java | 2 +- .../SubstrateAMD64SuitesCreatorProvider.java | 2 +- .../svm/core/graal/llvm/LLVMFeature.java | 12 +- .../svm/core/graal/llvm/LLVMGenerator.java | 80 +- .../graal/llvm/LLVMNativeImageCodeCache.java | 10 +- .../core/graal/llvm/LLVMToolchainUtils.java | 4 +- .../svm/core/graal/llvm/NodeLLVMBuilder.java | 110 +- .../core/graal/llvm/SubstrateLLVMBackend.java | 34 +- .../llvm/lowering/LLVMAddressLowering.java | 20 +- .../LLVMLoadExceptionObjectLowering.java | 14 +- .../SubstrateLLVMLoweringProvider.java | 18 +- .../graal/llvm/objectfile/LLVMObjectFile.java | 2 +- .../replacements/LLVMBinaryIntrinsicNode.java | 18 +- .../graal/llvm/replacements/LLVMCeilNode.java | 12 +- .../llvm/replacements/LLVMCopySignNode.java | 12 +- .../LLVMCountLeadingZerosNode.java | 12 +- .../LLVMCountTrailingZerosNode.java | 12 +- .../llvm/replacements/LLVMFloorNode.java | 12 +- .../replacements/LLVMGraphBuilderPlugins.java | 32 +- .../llvm/replacements/LLVMIntrinsicNode.java | 12 +- .../graal/llvm/replacements/LLVMMaxNode.java | 12 +- .../graal/llvm/replacements/LLVMMinNode.java | 12 +- .../replacements/LLVMUnaryIntrinsicNode.java | 18 +- .../llvm/runtime/LLVMExceptionUnwind.java | 2 +- .../graal/llvm/util/LLVMHelperFunctions.java | 2 +- .../core/graal/llvm/util/LLVMIRBuilder.java | 10 +- .../graal/llvm/util/LLVMObjectFileReader.java | 6 +- .../svm/core/graal/llvm/util/LLVMOptions.java | 4 +- .../graal/llvm/util/LLVMStackMapInfo.java | 2 +- .../svm/core/graal/llvm/util/LLVMUtils.java | 18 +- .../riscv64/RISCV64ReservedRegisters.java | 2 +- .../riscv64/SubstrateRISCV64Feature.java | 2 +- .../SubstrateRISCV64RegisterConfig.java | 90 +- .../com/oracle/svm/core/posix/PosixStat.java | 2 +- .../posix/PosixSubstrateSigprofHandler.java | 2 +- .../core/posix/PosixVMSemaphoreSupport.java | 2 +- .../posix/PosixVirtualMemoryProvider.java | 2 +- .../jvmstat/PosixPerfMemoryProvider.java | 2 +- .../svm/core/posix/linux/DumpLinuxOSInfo.java | 2 +- .../posix/linux/LinuxImageHeapProvider.java | 2 +- .../posix/pthread/PthreadConditionUtils.java | 2 +- .../posix/pthread/PthreadVMLockSupport.java | 2 +- ...V64LinuxUContextRegisterDumperFeature.java | 2 +- .../posix/thread/PosixPlatformThreads.java | 2 +- .../svm/core/posix/thread/PosixVMThreads.java | 2 +- .../core/windows/WindowsVMLockSupport.java | 2 +- .../com/oracle/svm/core/CPUFeatureAccess.java | 2 +- .../oracle/svm/core/CPUFeatureAccessImpl.java | 2 +- .../oracle/svm/core/CalleeSavedRegisters.java | 2 +- .../src/com/oracle/svm/core/Containers.java | 2 +- .../src/com/oracle/svm/core/DebugHelper.java | 2 +- .../com/oracle/svm/core/FallbackExecutor.java | 2 +- .../src/com/oracle/svm/core/FrameAccess.java | 6 +- .../svm/core/IsolateArgumentParser.java | 2 +- .../svm/core/IsolateListenerSupport.java | 2 +- .../src/com/oracle/svm/core/Isolates.java | 2 +- .../com/oracle/svm/core/JavaMainWrapper.java | 2 +- .../com/oracle/svm/core/JavaMemoryUtil.java | 4 +- .../oracle/svm/core/LinkToNativeSupport.java | 2 +- .../svm/core/MissingRegistrationSupport.java | 2 +- .../core/NativeImageClassLoaderOptions.java | 2 +- .../src/com/oracle/svm/core/Processor.java | 2 +- .../oracle/svm/core/ReservedRegisters.java | 2 +- .../svm/core/RuntimeAssertionsSupport.java | 4 +- .../oracle/svm/core/StaticFieldsSupport.java | 30 +- .../core/SubstrateControlFlowIntegrity.java | 2 +- .../oracle/svm/core/SubstrateDiagnostics.java | 20 +- .../oracle/svm/core/SubstrateGCOptions.java | 6 +- .../com/oracle/svm/core/SubstrateOptions.java | 22 +- .../svm/core/SubstrateSegfaultHandler.java | 4 +- .../com/oracle/svm/core/SubstrateUtil.java | 6 +- .../com/oracle/svm/core/Uninterruptible.java | 2 +- .../oracle/svm/core/VMInspectionOptions.java | 8 +- .../oracle/svm/core/WeakIdentityHashMap.java | 2 +- .../svm/core/aarch64/AArch64FrameAccess.java | 2 +- .../allocationprofile/AllocationSite.java | 2 +- .../svm/core/amd64/AMD64FrameAccess.java | 2 +- .../svm/core/c/CIsolateDataStorage.java | 4 +- .../oracle/svm/core/c/NonmovableArrays.java | 4 +- .../svm/core/c/UnmanagedPrimitiveArrays.java | 4 +- .../svm/core/c/enums/EnumArrayLookup.java | 2 +- .../svm/core/c/function/CEntryPointSetup.java | 2 +- .../com/oracle/svm/core/c/libc/LibCBase.java | 2 +- .../EnsureClassInitializedNode.java | 36 +- .../EnsureClassInitializedSnippets.java | 30 +- .../oracle/svm/core/code/CodeInfoAccess.java | 2 +- .../oracle/svm/core/code/CodeInfoDecoder.java | 6 +- .../oracle/svm/core/code/CodeInfoEncoder.java | 12 +- .../oracle/svm/core/code/CodeInfoImpl.java | 2 +- .../oracle/svm/core/code/CodeInfoTable.java | 4 +- .../core/code/CompilationResultFrameTree.java | 6 +- .../DeoptimizationSourcePositionDecoder.java | 2 +- .../DeoptimizationSourcePositionEncoder.java | 8 +- ...micMethodAddressResolutionHeapSupport.java | 2 +- .../svm/core/code/FrameInfoDecoder.java | 4 +- .../svm/core/code/FrameInfoEncoder.java | 14 +- .../oracle/svm/core/code/ImageCodeInfo.java | 2 +- .../svm/core/code/InstalledCodeObserver.java | 4 +- .../code/InstalledCodeObserverSupport.java | 4 +- .../svm/core/code/ReferenceAdjuster.java | 2 +- .../svm/core/code/ReusableTypeReader.java | 4 +- .../svm/core/code/RuntimeCodeCache.java | 6 +- .../svm/core/code/RuntimeCodeInfoHistory.java | 2 +- .../svm/core/code/RuntimeCodeInfoMemory.java | 2 +- .../collections/GrowableWordArrayAccess.java | 4 +- .../svm/core/config/ConfigurationValues.java | 2 +- .../oracle/svm/core/config/ObjectLayout.java | 6 +- .../core/configure/ConfigurationFiles.java | 6 +- .../core/configure/ConfigurationParser.java | 4 +- .../PredefinedClassesConfigurationParser.java | 2 +- .../configure/ProxyConfigurationParser.java | 2 +- .../ReflectionConfigurationParser.java | 2 +- .../ResourceConfigurationParser.java | 2 +- .../SerializationConfigurationParser.java | 2 +- .../cpufeature/RuntimeCPUFeatureCheck.java | 4 +- .../RuntimeCPUFeatureCheckImpl.java | 36 +- .../com/oracle/svm/core/cpufeature/Stubs.java | 28 +- .../core/deopt/DeoptimizationCounters.java | 4 +- .../svm/core/deopt/DeoptimizationRuntime.java | 2 +- .../svm/core/deopt/DeoptimizationSupport.java | 2 +- .../oracle/svm/core/deopt/Deoptimizer.java | 10 +- .../core/deopt/SubstrateInstalledCode.java | 2 +- .../svm/core/doc-files/NeverInlineHelp.txt | 8 +- .../svm/core/feature/InternalFeature.java | 12 +- .../core/graal/EconomyGraalConfiguration.java | 2 +- .../svm/core/graal/GraalConfiguration.java | 40 +- .../svm/core/graal/RuntimeCompilation.java | 2 +- .../core/graal/code/PatchConsumerFactory.java | 4 +- .../svm/core/graal/code/SubstrateBackend.java | 30 +- .../graal/code/SubstrateBackendFactory.java | 2 +- .../code/SubstrateCompilationIdentifier.java | 4 +- .../code/SubstrateCompilationResult.java | 6 +- .../graal/code/SubstrateCompiledCode.java | 2 +- .../core/graal/code/SubstrateDataBuilder.java | 10 +- .../graal/code/SubstrateDebugInfoBuilder.java | 14 +- .../SubstrateLoweringProviderFactory.java | 8 +- .../SubstrateMetaAccessExtensionProvider.java | 2 +- .../graal/code/SubstrateNodeLIRBuilder.java | 2 +- ...ubstratePlatformConfigurationProvider.java | 4 +- .../graal/code/SubstrateSuitesCreator.java | 8 +- .../code/SubstrateSuitesCreatorProvider.java | 8 +- .../core/graal/jdk/JDKIntrinsicsFeature.java | 16 +- .../graal/jdk/SubstrateArraycopySnippets.java | 32 +- .../graal/jdk/SubstrateObjectCloneNode.java | 32 +- .../jdk/SubstrateObjectCloneSnippets.java | 52 +- ...SubstrateObjectCloneWithExceptionNode.java | 38 +- .../svm/core/graal/lir/DeoptEntryOp.java | 10 +- .../graal/lir/DeoptSourcePositionInfoOp.java | 8 +- .../core/graal/lir/VerificationMarkerOp.java | 6 +- .../VerifyCFunctionReferenceMapsLIRPhase.java | 12 +- .../svm/core/graal/meta/KnownOffsets.java | 2 +- .../core/graal/meta/RuntimeConfiguration.java | 8 +- .../meta/SubstrateBasicLoweringProvider.java | 76 +- .../meta/SubstrateForeignCallLinkage.java | 2 +- .../meta/SubstrateForeignCallsProvider.java | 10 +- .../graal/meta/SubstrateLoweringProvider.java | 20 +- .../meta/SubstrateMemoryAccessProvider.java | 2 +- .../graal/meta/SubstrateReplacements.java | 76 +- .../SubstrateSnippetReflectionProvider.java | 4 +- .../graal/meta/SubstrateStampProvider.java | 10 +- .../graal/nodes/CEntryPointEnterNode.java | 24 +- .../graal/nodes/CEntryPointLeaveNode.java | 50 +- .../graal/nodes/CEntryPointUtilityNode.java | 24 +- .../nodes/CGlobalDataLoadAddressNode.java | 14 +- .../core/graal/nodes/CInterfaceReadNode.java | 14 +- .../core/graal/nodes/CInterfaceWriteNode.java | 14 +- .../nodes/ComputedIndirectCallTargetNode.java | 10 +- .../core/graal/nodes/DeoptEntryBeginNode.java | 14 +- .../svm/core/graal/nodes/DeoptEntryNode.java | 32 +- .../core/graal/nodes/DeoptEntrySupport.java | 8 +- .../graal/nodes/DeoptProxyAnchorNode.java | 16 +- .../nodes/DeoptSourcePositionInfoNode.java | 18 +- .../svm/core/graal/nodes/DeoptTestNode.java | 20 +- .../svm/core/graal/nodes/FarReturnNode.java | 22 +- .../graal/nodes/FloatingWordCastNode.java | 26 +- .../nodes/ForeignCallWithExceptionNode.java | 50 +- .../nodes/InlinedInvokeArgumentsNode.java | 16 +- .../core/graal/nodes/LazyConstantNode.java | 32 +- .../core/graal/nodes/LoweredDeadEndNode.java | 21 +- .../core/graal/nodes/MethodReturnNode.java | 24 +- .../core/graal/nodes/NewPodInstanceNode.java | 12 +- .../nodes/NewStoredContinuationNode.java | 12 +- .../nodes/ReadCallerStackPointerNode.java | 14 +- .../graal/nodes/ReadExceptionObjectNode.java | 18 +- .../graal/nodes/ReadReservedRegister.java | 4 +- .../nodes/ReadReservedRegisterFixedNode.java | 16 +- .../ReadReservedRegisterFloatingNode.java | 16 +- .../graal/nodes/ReadReturnAddressNode.java | 14 +- .../graal/nodes/SubstrateCompressionNode.java | 26 +- .../nodes/SubstrateFieldLocationIdentity.java | 2 +- .../graal/nodes/SubstrateNarrowOopStamp.java | 16 +- .../nodes/SubstrateNewHybridInstanceNode.java | 12 +- ...SubstrateReflectionGetCallerClassNode.java | 6 +- .../core/graal/nodes/TestDeoptimizeNode.java | 20 +- .../nodes/ThrowBytecodeExceptionNode.java | 30 +- .../graal/nodes/VaListInitializationNode.java | 20 +- .../core/graal/nodes/VaListNextArgNode.java | 22 +- .../graal/nodes/VerificationMarkerNode.java | 20 +- .../graal/nodes/WriteCurrentVMThreadNode.java | 20 +- .../core/graal/nodes/WriteHeapBaseNode.java | 20 +- .../graal/nodes/WriteReturnAddressNode.java | 20 +- .../graal/nodes/WriteStackPointerNode.java | 20 +- .../graal/nodes/aarch64/AArch64ISBNode.java | 18 +- .../graal/nodes/aarch64/AArch64XPACNode.java | 34 +- ...ectDeoptimizationSourcePositionsPhase.java | 12 +- .../graal/phases/DeadStoreRemovalPhase.java | 8 +- .../phases/OptimizeExceptionPathsPhase.java | 34 +- .../core/graal/phases/RemoveUnwindPhase.java | 30 +- .../SubstrateSafepointInsertionPhase.java | 10 +- .../phases/TrustedInterfaceTypePlugin.java | 10 +- .../graal/replacements/SubstrateGraphKit.java | 90 +- .../graal/snippets/ArithmeticSnippets.java | 54 +- .../graal/snippets/CEntryPointListener.java | 2 +- .../snippets/CEntryPointListenerSupport.java | 2 +- .../graal/snippets/CEntryPointSnippets.java | 36 +- .../graal/snippets/CFunctionSnippets.java | 34 +- .../graal/snippets/DeoptHostedSnippets.java | 28 +- .../graal/snippets/DeoptRuntimeSnippets.java | 26 +- .../graal/snippets/DeoptSnippetsFeature.java | 6 +- .../graal/snippets/DeoptTestSnippets.java | 18 +- .../svm/core/graal/snippets/DeoptTester.java | 4 +- .../graal/snippets/ExceptionSnippets.java | 32 +- .../graal/snippets/GCAllocationSupport.java | 4 +- .../graal/snippets/NodeLoweringProvider.java | 4 +- .../graal/snippets/NonSnippetLowerings.java | 94 +- .../graal/snippets/SafepointSnippets.java | 34 +- .../snippets/StackOverflowCheckFeature.java | 16 +- .../snippets/StackOverflowCheckImpl.java | 58 +- .../snippets/SubstrateAllocationSnippets.java | 94 +- .../graal/snippets/SubstrateIntrinsics.java | 14 +- .../graal/snippets/SubstrateTemplates.java | 10 +- .../svm/core/graal/snippets/TypeSnippets.java | 42 +- .../aarch64/AArch64ArithmeticSnippets.java | 30 +- .../aarch64/AArch64NonSnippetLowerings.java | 6 +- .../aarch64/AArch64SnippetsFeature.java | 6 +- .../aarch64/PosixAArch64VaListSnippets.java | 18 +- .../amd64/AMD64ArithmeticSnippets.java | 6 +- .../amd64/AMD64NonSnippetLowerings.java | 12 +- .../snippets/amd64/AMD64SnippetsFeature.java | 6 +- .../amd64/PosixAMD64VaListSnippets.java | 18 +- .../riscv64/PosixRISCV64VaListSnippets.java | 34 +- .../riscv64/RISCV64ArithmeticSnippets.java | 6 +- .../riscv64/RISCV64NonSnippetLowerings.java | 6 +- .../riscv64/RISCV64SnippetsFeature.java | 6 +- .../stackvalue/LoweredStackValueNode.java | 16 +- .../graal/stackvalue/StackValueFeature.java | 20 +- .../core/graal/stackvalue/StackValueNode.java | 32 +- .../StackValueRecursionDepthPhase.java | 6 +- .../StackValueSlotAssignmentPhase.java | 4 +- .../graal/stackvalue/StackValueSnippets.java | 32 +- .../thread/AddressOfVMThreadLocalNode.java | 20 +- .../CompareAndSetVMThreadLocalNode.java | 26 +- .../graal/thread/LoadVMThreadLocalNode.java | 42 +- .../graal/thread/StoreVMThreadLocalNode.java | 34 +- .../thread/VMThreadLocalSTHolderNode.java | 24 +- .../svm/core/graal/word/DynamicHubAccess.java | 2 +- .../word/SubstrateWordOperationPlugins.java | 30 +- .../core/graal/word/SubstrateWordTypes.java | 2 +- .../src/com/oracle/svm/core/headers/LibC.java | 2 +- .../oracle/svm/core/headers/WindowsAPIs.java | 2 +- .../svm/core/heap/BarrierSetProvider.java | 5 +- .../core/heap/CodeReferenceMapDecoder.java | 4 +- .../core/heap/CodeReferenceMapEncoder.java | 2 +- .../src/com/oracle/svm/core/heap/Heap.java | 2 +- .../oracle/svm/core/heap/ObjectHeader.java | 6 +- .../src/com/oracle/svm/core/heap/Pod.java | 2 +- .../svm/core/heap/PodReferenceMapDecoder.java | 6 +- .../oracle/svm/core/heap/ReferenceAccess.java | 6 +- .../svm/core/heap/ReferenceAccessImpl.java | 10 +- .../svm/core/heap/ReferenceHandlerThread.java | 2 +- .../svm/core/heap/ReferenceInternals.java | 14 +- .../svm/core/heap/ReferenceMapEncoder.java | 4 +- .../svm/core/heap/StoredContinuation.java | 2 +- .../core/heap/StoredContinuationAccess.java | 10 +- .../svm/core/heap/SubstrateReferenceMap.java | 2 +- .../heap/SubstrateReferenceMapBuilder.java | 6 +- .../heap/Target_java_lang_ref_Reference.java | 2 +- .../svm/core/heap/VMOperationInfos.java | 2 +- .../svm/core/heap/dump/HProfSubRecord.java | 2 +- .../core/heap/dump/HProfTopLevelRecord.java | 2 +- .../oracle/svm/core/heap/dump/HProfType.java | 2 +- .../svm/core/heap/dump/HeapDumpMetadata.java | 2 +- .../core/heap/dump/HeapDumpSupportImpl.java | 2 +- .../svm/core/heap/dump/HeapDumpWriter.java | 10 +- .../svm/core/heap/dump/HeapDumping.java | 2 +- .../svm/core/heapdump/HeapDumpUtils.java | 2 +- .../com/oracle/svm/core/hub/DynamicHub.java | 6 +- .../svm/core/hub/InteriorObjRefWalker.java | 4 +- .../oracle/svm/core/hub/LayoutEncoding.java | 6 +- .../core/hub/PredefinedClassesSupport.java | 4 +- .../oracle/svm/core/hub/ReferenceType.java | 2 +- .../IdentityHashCodeSupport.java | 12 +- .../SubstrateIdentityHashCodeNode.java | 16 +- .../SubstrateIdentityHashCodeSnippets.java | 26 +- .../svm/core/jdk/ClassLoaderSupport.java | 2 +- .../core/jdk/FileSystemProviderSupport.java | 2 +- .../oracle/svm/core/jdk/JDK11OrEarlier.java | 2 +- .../oracle/svm/core/jdk/JDK17OrEarlier.java | 2 +- .../com/oracle/svm/core/jdk/JDK17OrLater.java | 2 +- .../oracle/svm/core/jdk/JDK21OrEarlier.java | 2 +- .../com/oracle/svm/core/jdk/JDK22OrLater.java | 2 +- .../com/oracle/svm/core/jdk/JRTSupport.java | 4 +- .../svm/core/jdk/JavaIOSubstitutions.java | 2 +- .../jdk/JavaLangReflectSubstitutions.java | 2 +- .../svm/core/jdk/JavaLangSubstitutions.java | 8 +- .../svm/core/jdk/ProtectionDomainSupport.java | 4 +- .../oracle/svm/core/jdk/RuntimeSupport.java | 2 +- .../oracle/svm/core/jdk/StackTraceUtils.java | 4 +- .../svm/core/jdk/SunMiscSubstitutions.java | 2 +- .../svm/core/jdk/SystemPropertiesSupport.java | 2 +- .../svm/core/jdk/TimeZoneSubstitutions.java | 4 +- .../svm/core/jdk/VMErrorSubstitutions.java | 2 +- ...ContentSubstitutedLocalizationSupport.java | 2 +- .../jdk/localization/LocalizationSupport.java | 2 +- .../utils/BundleSerializationUtils.java | 2 +- .../svm/core/jdk/management/JmxIncluded.java | 2 +- .../jdk/management/ManagementSupport.java | 2 +- .../oracle/svm/core/jfr/HasJfrSupport.java | 2 +- .../oracle/svm/core/jfr/JfrBufferAccess.java | 2 +- .../svm/core/jfr/JfrCheckpointType.java | 2 +- .../oracle/svm/core/jfr/JfrChunkWriter.java | 4 +- .../com/oracle/svm/core/jfr/JfrGCNames.java | 2 +- .../svm/core/jfr/JfrJdkCompatibility.java | 2 +- .../com/oracle/svm/core/jfr/JfrManager.java | 4 +- .../svm/core/jfr/JfrMetadataTypeLibrary.java | 4 +- .../com/oracle/svm/core/jfr/JfrOptionSet.java | 2 +- .../svm/core/jfr/JfrRecorderThread.java | 2 +- .../svm/core/jfr/JfrSerializerSupport.java | 2 +- .../svm/core/jfr/JfrSymbolRepository.java | 4 +- .../oracle/svm/core/jfr/JfrThreadLocal.java | 2 +- .../com/oracle/svm/core/jfr/SubstrateJVM.java | 4 +- .../core/jfr/Target_jdk_jfr_internal_JVM.java | 2 +- .../jfr/events/JavaMonitorEnterEvent.java | 2 +- .../jfr/events/JavaMonitorInflateEvent.java | 2 +- .../core/jfr/events/JavaMonitorWaitEvent.java | 2 +- .../svm/core/jfr/events/ThreadParkEvent.java | 2 +- .../sampler/AbstractJfrExecutionSampler.java | 2 +- .../core/jfr/sampler/JfrExecutionSampler.java | 2 +- .../svm/core/jfr/traceid/JfrTraceIdEpoch.java | 2 +- .../svm/core/jfr/traceid/JfrTraceIdMap.java | 2 +- .../oracle/svm/core/jni/JNIJavaVMList.java | 2 +- .../oracle/svm/core/jni/JNIObjectHandles.java | 6 +- .../core/jni/access/JNIAccessibleMethod.java | 4 +- .../jni/access/JNIReflectionDictionary.java | 2 +- .../core/jni/functions/JNIFunctionTables.java | 2 +- .../svm/core/jni/functions/JNIFunctions.java | 6 +- .../jni/functions/JNIInvocationInterface.java | 2 +- .../svm/core/jni/headers/JNIVersion.java | 2 +- .../jni/headers/JNIVersionJDK22OrLater.java | 2 +- .../core/jvmstat/AbstractPerfDataEntry.java | 4 +- .../oracle/svm/core/jvmstat/PerfManager.java | 4 +- .../oracle/svm/core/jvmstat/PerfMemory.java | 2 +- .../svm/core/jvmstat/PerfMemoryPrologue.java | 2 +- .../src/com/oracle/svm/core/log/Log.java | 2 +- .../src/com/oracle/svm/core/log/RealLog.java | 4 +- .../svm/core/meta/CompressedNullConstant.java | 2 +- .../svm/core/meta/ObjectConstantEquality.java | 8 +- .../meta/SubstrateMethodPointerStamp.java | 10 +- .../core/meta/SubstrateObjectConstant.java | 4 +- ..._java_lang_invoke_MethodHandleNatives.java | 2 +- .../oracle/svm/core/monitor/JavaMonitor.java | 6 +- .../svm/core/monitor/MonitorFeature.java | 6 +- .../svm/core/monitor/MonitorSnippets.java | 46 +- .../svm/core/monitor/MonitorSupport.java | 2 +- .../monitor/MultiThreadedMonitorSupport.java | 4 +- .../svm/core/nodes/CFunctionCaptureNode.java | 33 +- .../svm/core/nodes/CFunctionEpilogueNode.java | 28 +- .../core/nodes/CFunctionPrologueDataNode.java | 18 +- .../svm/core/nodes/CFunctionPrologueNode.java | 26 +- .../core/nodes/CodeSynchronizationNode.java | 14 +- .../svm/core/nodes/SafepointCheckNode.java | 28 +- .../nodes/SubstrateMethodCallTargetNode.java | 10 +- .../com/oracle/svm/core/option/APIOption.java | 2 +- .../svm/core/option/HostedOptionKey.java | 6 +- .../svm/core/option/HostedOptionValues.java | 4 +- .../oracle/svm/core/option/OptionOrigin.java | 2 +- .../oracle/svm/core/option/OptionUtils.java | 2 +- .../svm/core/option/RuntimeOptionKey.java | 6 +- .../svm/core/option/RuntimeOptionParser.java | 10 +- .../svm/core/option/RuntimeOptionValues.java | 16 +- .../core/option/SubstrateOptionsParser.java | 6 +- .../ValidateImageBuildOptionsFeature.java | 2 +- .../com/oracle/svm/core/option/XOptions.java | 2 +- .../oracle/svm/core/option/package-info.java | 14 +- .../os/AbstractCommittedMemoryProvider.java | 2 +- .../os/AbstractCopyingImageHeapProvider.java | 2 +- .../core/os/AbstractImageHeapProvider.java | 2 +- .../os/AbstractRawFileOperationSupport.java | 4 +- .../core/os/BufferedFileOperationSupport.java | 4 +- .../svm/core/os/CommittedMemoryProvider.java | 2 +- .../oracle/svm/core/os/ImageHeapProvider.java | 2 +- .../svm/core/os/MemoryProtectionProvider.java | 2 +- .../svm/core/os/RawFileOperationSupport.java | 2 +- .../svm/core/os/VirtualMemoryProvider.java | 2 +- .../core/reflect/SubstrateMethodAccessor.java | 4 +- .../reflect/proxy/DynamicProxySupport.java | 2 +- .../serialize/SerializationSupport.java | 2 +- .../target/ReflectionMetadataDecoderImpl.java | 2 +- ...dk_internal_reflect_AccessorGenerator.java | 2 +- .../core/riscv64/RISCV64CPUFeatureAccess.java | 2 +- .../svm/core/riscv64/RISCV64FrameAccess.java | 2 +- .../sampler/SafepointProfilingSampler.java | 2 +- .../svm/core/sampler/SamplerBufferAccess.java | 2 +- .../svm/core/sampler/SamplerSampleWriter.java | 2 +- .../svm/core/sampler/SamplerSpinLock.java | 2 +- .../core/sampler/SubstrateSigprofHandler.java | 2 +- .../svm/core/snippets/SnippetRuntime.java | 6 +- .../snippets/SubstrateIsArraySnippets.java | 2 +- .../svm/core/stack/StackOverflowCheck.java | 4 +- .../stack/SubstrateStackIntrospection.java | 2 +- .../oracle/svm/core/thread/Continuation.java | 2 +- .../svm/core/thread/ContinuationSupport.java | 2 +- .../svm/core/thread/ContinuationsFeature.java | 2 +- .../svm/core/thread/JavaSpinLockUtils.java | 2 +- .../oracle/svm/core/thread/JavaThreads.java | 8 +- .../oracle/svm/core/thread/LoomSupport.java | 2 +- .../svm/core/thread/LoomVirtualThreads.java | 2 +- .../com/oracle/svm/core/thread/Parker.java | 2 +- .../svm/core/thread/PlatformThreads.java | 4 +- .../com/oracle/svm/core/thread/Safepoint.java | 18 +- .../core/thread/SafepointListenerSupport.java | 2 +- .../thread/Target_java_lang_ScopedValue.java | 2 +- .../core/thread/Target_java_lang_Thread.java | 4 +- .../Target_java_lang_VirtualThread.java | 2 +- .../svm/core/thread/ThreadCpuTimeSupport.java | 2 +- .../core/thread/ThreadListenerSupport.java | 2 +- .../svm/core/thread/ThreadingSupportImpl.java | 4 +- .../svm/core/thread/VMOperationControl.java | 4 +- .../thread/VMOperationListenerSupport.java | 2 +- .../com/oracle/svm/core/thread/VMThreads.java | 8 +- .../svm/core/thread/VirtualThreads.java | 2 +- .../core/threadlocal/VMThreadLocalInfos.java | 4 +- .../threadlocal/VMThreadLocalMTSupport.java | 2 +- .../oracle/svm/core/util/ByteArrayReader.java | 4 +- .../oracle/svm/core/util/CounterSupport.java | 2 +- .../core/util/HostedByteBufferPointer.java | 2 +- .../core/util/HostedStringDeduplication.java | 2 +- .../core/util/NonmovableByteArrayReader.java | 2 +- .../util/NonmovableByteArrayTypeReader.java | 2 +- .../svm/core/util/coder/Pack200Coder.java | 2 +- .../oracle/svm/driver/APIOptionHandler.java | 8 +- .../svm/driver/CmdLineOptionHandler.java | 2 +- .../com/oracle/svm/driver/NativeImage.java | 4 +- .../svm/driver/metainf/MetaInfFileType.java | 2 +- .../hotspot/libgraal/LibGraalEntryPoints.java | 41 +- .../hotspot/libgraal/LibGraalFeature.java | 120 +- .../libgraal/truffle/HSTruffleCompilable.java | 4 +- .../truffle/LibGraalNativeBridgeSupport.java | 4 +- .../LibGraalTruffleHostEnvironment.java | 10 +- .../LibGraalTruffleHostEnvironmentLookup.java | 6 +- .../truffle/TruffleLibGraalFeature.java | 2 +- .../truffle/TruffleLibGraalShutdownHook.java | 4 +- .../truffle/TruffleToLibGraalEntryPoints.java | 12 +- ...latedSpeculationLogEncodingNativeTest.java | 4 +- .../com/oracle/svm/graal/GraalSupport.java | 52 +- .../svm/graal/RuntimeCPUFeatureRegion.java | 38 +- .../svm/graal/SubstrateGraalRuntime.java | 8 +- .../oracle/svm/graal/SubstrateGraalUtils.java | 34 +- .../aarch64/AArch64CPUFeatureRegionOp.java | 8 +- .../graal/amd64/AMD64CPUFeatureRegionOp.java | 8 +- .../graal/hosted/DeoptimizationFeature.java | 6 +- .../graal/hosted/FieldsOffsetsFeature.java | 18 +- .../hosted/GraalGraphObjectReplacer.java | 24 +- .../LegacyRuntimeCompilationFeature.java | 52 +- .../hosted/ParseOnceDeoptTestFeature.java | 6 +- .../ParseOnceRuntimeCompilationFeature.java | 72 +- .../hosted/RuntimeCompilationFeature.java | 40 +- .../hosted/SubstrateGraalCompilerSetup.java | 6 +- .../svm/graal/hosted/SubstrateProviders.java | 6 +- .../svm/graal/isolated/CodeInstallInfo.java | 2 +- .../DisableSnippetCountersFeature.java | 21 +- .../svm/graal/isolated/ImageHeapObjects.java | 2 +- .../IsolateAwareCodeCacheProvider.java | 2 +- ...solateAwareConstantReflectionProvider.java | 2 +- .../graal/isolated/IsolateAwareProviders.java | 2 +- ...IsolateAwareSnippetReflectionProvider.java | 2 +- .../graal/isolated/IsolatedGraalUtils.java | 14 +- .../IsolatedRuntimeCodeInstaller.java | 4 +- .../isolated/IsolatedSpeculationLog.java | 2 +- .../graal/isolated/OptionValuesEncoder.java | 6 +- .../graal/meta/EncodedLineNumberTable.java | 6 +- .../svm/graal/meta/RuntimeCodeInstaller.java | 14 +- .../meta/SubstrateCodeCacheProvider.java | 4 +- .../meta/SubstrateConstantFieldProvider.java | 2 +- .../SubstrateConstantReflectionProvider.java | 4 +- .../meta/SubstrateInstalledCodeImpl.java | 2 +- .../SubstrateMemoryAccessProviderImpl.java | 4 +- .../svm/graal/meta/SubstrateMethod.java | 4 +- .../SubstrateRuntimeConfigurationBuilder.java | 32 +- .../stubs/AArch64StubForeignCallsFeature.java | 50 +- .../stubs/AMD64StubForeignCallsFeature.java | 50 +- .../svm/graal/stubs/SVMIntrinsicStubs.java | 54 +- .../stubs/StubForeignCallsFeatureBase.java | 6 +- .../substitutions/GraalSubstitutions.java | 135 +- .../svm/hosted/foreign/DowncallStub.java | 10 +- .../foreign/ForeignFunctionsFeature.java | 4 +- .../svm/hosted/foreign/ForeignGraphKit.java | 4 +- .../hosted/CPUFeatureAccessFeatureBase.java | 2 +- .../svm/hosted/ExceptionSynthesizer.java | 16 +- .../com/oracle/svm/hosted/FeatureHandler.java | 4 +- .../com/oracle/svm/hosted/FeatureImpl.java | 4 +- .../svm/hosted/HostedConfiguration.java | 12 +- .../oracle/svm/hosted/ImageClassLoader.java | 4 +- .../svm/hosted/LinkAtBuildTimeSupport.java | 2 +- .../com/oracle/svm/hosted/LoggingFeature.java | 4 +- .../hosted/NativeImageClassLoaderSupport.java | 4 +- .../svm/hosted/NativeImageGenerator.java | 110 +- .../hosted/NativeImageGeneratorRunner.java | 8 +- .../oracle/svm/hosted/NativeImageOptions.java | 14 +- .../oracle/svm/hosted/ProgressReporter.java | 8 +- .../RISCV64CPUFeatureAccessFeature.java | 2 +- .../hosted/ReachabilityRegistrationNode.java | 25 +- .../oracle/svm/hosted/ResourcesFeature.java | 20 +- .../src/com/oracle/svm/hosted/SVMHost.java | 42 +- .../svm/hosted/SecurityServicesFeature.java | 2 +- .../svm/hosted/ServiceLoaderFeature.java | 16 +- .../svm/hosted/SubstitutionReportFeature.java | 2 +- .../svm/hosted/SubstrateStrengthenGraphs.java | 18 +- .../AnalysisConstantReflectionProvider.java | 4 +- .../AnalysisMethodHandleAccessProvider.java | 2 +- .../svm/hosted/analysis/CallChecker.java | 2 +- .../analysis/NativeImagePointsToAnalysis.java | 6 +- ...NativeImageReachabilityAnalysisEngine.java | 6 +- .../analysis/ReachabilityTracePrinter.java | 6 +- .../hosted/analysis/SVMParsingSupport.java | 6 +- .../SubstrateUnsupportedFeatures.java | 2 +- .../flow/SVMMethodTypeFlowBuilder.java | 22 +- .../annotation/AnnotationArrayValue.java | 2 +- .../AnnotationExceptionProxyValue.java | 2 +- .../annotation/AnnotationMemberValue.java | 2 +- .../hosted/annotation/AnnotationMetadata.java | 2 +- .../hosted/annotation/AnnotationValue.java | 2 +- .../hosted/c/CAnnotationProcessorCache.java | 6 +- .../svm/hosted/c/CGlobalDataFeature.java | 64 +- .../oracle/svm/hosted/c/NativeLibraries.java | 12 +- .../hosted/c/codegen/CCompilerInvoker.java | 4 +- .../hosted/c/function/CEntryPointSupport.java | 28 +- .../svm/hosted/c/info/InfoTreeBuilder.java | 4 +- .../oracle/svm/hosted/c/util/FileUtils.java | 2 +- .../hosted/cenum/CEnumCallWrapperMethod.java | 12 +- ...ostedUsagesClassInitializationSupport.java | 2 +- .../ClassInitializationFeature.java | 12 +- .../ClassInitializationOptions.java | 4 +- .../ClassInitializationSupport.java | 2 +- .../ClassInitializerGraphBuilderPhase.java | 14 +- .../EarlyClassInitializerAnalysis.java | 56 +- ...imulateClassInitializerAbortException.java | 6 +- .../SimulateClassInitializerGraphDecoder.java | 52 +- .../SimulateClassInitializerPolicy.java | 14 +- .../SimulateClassInitializerSupport.java | 46 +- .../AnalysisToHostedGraphTransplanter.java | 42 +- .../svm/hosted/code/CCallStubMethod.java | 8 +- .../code/CEntryPointCallStubMethod.java | 36 +- .../code/CEntryPointJavaCallStubMethod.java | 6 +- .../hosted/code/CFunctionCallStubMethod.java | 6 +- .../svm/hosted/code/CFunctionLinkages.java | 4 +- .../code/CFunctionPointerCallStubMethod.java | 6 +- .../svm/hosted/code/CompilationGraph.java | 12 +- .../svm/hosted/code/CompilationInfo.java | 12 +- .../oracle/svm/hosted/code/CompileQueue.java | 116 +- .../svm/hosted/code/DeoptimizationUtils.java | 62 +- .../oracle/svm/hosted/code/FactoryMethod.java | 12 +- .../svm/hosted/code/FactoryMethodSupport.java | 4 +- .../code/HostedImageHeapConstantPatch.java | 2 +- .../svm/hosted/code/HostedReplacements.java | 12 +- .../HostedRuntimeConfigurationBuilder.java | 28 +- ...IncompatibleClassChangeFallbackMethod.java | 12 +- .../svm/hosted/code/InliningUtilities.java | 20 +- .../NativeMethodSubstitutionProcessor.java | 8 +- .../RestrictHeapAccessAnnotationChecker.java | 6 +- .../SharedRuntimeConfigurationBuilder.java | 30 +- .../code/SubstrateCompilationDirectives.java | 6 +- .../svm/hosted/code/SubstrateGraphMaker.java | 24 +- .../code/SubstrateGraphMakerFactory.java | 6 +- .../SubstrateHostedCompilationIdentifier.java | 4 +- .../code/SubstrateLIRBackendFeature.java | 8 +- .../UninterruptibleAnnotationChecker.java | 16 +- .../aarch64/AArch64HostedPatcherFeature.java | 10 +- .../AArch64HostedTrampolineSupport.java | 8 +- .../code/amd64/AMD64HostedPatcherFeature.java | 8 +- .../amd64/AMD64HostedTrampolineSupport.java | 10 +- .../config/ConfigurationParserUtils.java | 2 +- .../svm/hosted/config/HybridLayout.java | 2 +- .../hosted/config/HybridLayoutSupport.java | 2 +- .../dashboard/DashboardDumpFeature.java | 4 +- .../hosted/dashboard/DashboardOptions.java | 4 +- .../hosted/dashboard/PointsToJsonObject.java | 4 +- .../diagnostic/HostedHeapDumpFeature.java | 2 +- .../IsStaticFinalFieldInitializedNode.java | 22 +- .../MarkStaticFinalFieldInitializedNode.java | 20 +- .../StaticFinalFieldFoldingFeature.java | 12 +- .../StaticFinalFieldFoldingNodePlugin.java | 26 +- .../svm/hosted/heap/HeapDumpFeature.java | 4 +- .../svm/hosted/heap/HeapDumpHostedUtils.java | 4 +- .../heap/PodFactorySubstitutionMethod.java | 32 +- .../svm/hosted/heap/SVMImageHeapScanner.java | 4 +- .../svm/hosted/image/AbstractImage.java | 2 +- .../svm/hosted/image/CCLinkerInvocation.java | 4 +- .../image/HostedInstantReferenceAdjuster.java | 2 +- .../ImageHeapConnectedComponentsFeature.java | 4 +- .../hosted/image/LIRNativeImageCodeCache.java | 10 +- .../oracle/svm/hosted/image/NativeImage.java | 12 +- .../hosted/image/NativeImageCodeCache.java | 10 +- .../image/NativeImageDebugInfoFeature.java | 4 +- .../image/NativeImageDebugInfoProvider.java | 8 +- .../NativeImageDebugInfoProviderBase.java | 2 +- .../NativeImageDebugInfoStripFeature.java | 8 +- .../svm/hosted/image/NativeImageHeap.java | 10 +- .../hosted/image/NativeImageHeapWriter.java | 10 +- .../svm/hosted/image/NativeImageViaCC.java | 4 +- .../svm/hosted/image/RelocatableBuffer.java | 2 +- .../hosted/image/SharedLibraryImageViaCC.java | 2 +- .../svm/hosted/image/sources/SourceCache.java | 2 +- .../hosted/image/sources/SourceManager.java | 2 +- .../AccessControlContextReplacerFeature.java | 2 +- .../hosted/jdk/JNIRegistrationSupport.java | 22 +- .../jdk/localization/LocalizationFeature.java | 12 +- .../svm/hosted/jni/JNIAccessFeature.java | 6 +- .../hosted/jni/JNICallTrampolineMethod.java | 4 +- .../hosted/jni/JNIFieldAccessorMethod.java | 12 +- .../oracle/svm/hosted/jni/JNIGraphKit.java | 44 +- .../jni/JNIJavaCallVariantWrapperMethod.java | 44 +- .../hosted/jni/JNIJavaCallWrapperMethod.java | 42 +- .../jni/JNINativeCallWrapperMethod.java | 16 +- .../jni/JNIPrimitiveArrayOperationMethod.java | 12 +- ...bdaProxyRenamingSubstitutionProcessor.java | 12 +- .../lambda/StableLambdaProxyNameFeature.java | 2 +- ...HostedLookupSnippetReflectionProvider.java | 2 +- .../meta/HostedMemoryAccessProvider.java | 4 +- .../svm/hosted/meta/HostedMetaAccess.java | 2 +- .../oracle/svm/hosted/meta/HostedMethod.java | 10 +- .../meta/HostedSnippetReflectionProvider.java | 2 +- .../svm/hosted/meta/HostedUniverse.java | 4 +- .../svm/hosted/meta/RelocatableConstant.java | 2 +- .../meta/SharedConstantFieldProvider.java | 2 +- .../svm/hosted/meta/TypeCheckBuilder.java | 2 +- .../svm/hosted/meta/UniverseBuilder.java | 6 +- .../methodhandles/MethodHandleFeature.java | 2 +- .../svm/hosted/nodes/DeoptProxyNode.java | 34 +- .../hosted/option/HostedOptionCustomizer.java | 4 +- .../svm/hosted/option/HostedOptionParser.java | 8 +- .../hosted/option/HostedOptionProvider.java | 2 +- .../hosted/option/RuntimeOptionFeature.java | 6 +- .../phases/AnalysisGraphBuilderPhase.java | 34 +- .../svm/hosted/phases/CInterfaceEnumTool.java | 34 +- .../phases/CInterfaceInvocationPlugin.java | 68 +- .../phases/ConstantFoldLoadFieldPlugin.java | 10 +- .../DeoptimizationTargetBciBlockMapping.java | 14 +- .../hosted/phases/DevirtualizeCallsPhase.java | 28 +- .../EarlyConstantFoldLoadFieldPlugin.java | 6 +- .../svm/hosted/phases/EnumSwitchPlugin.java | 18 +- .../phases/HostedGraphBuilderPhase.java | 28 +- .../svm/hosted/phases/HostedGraphKit.java | 42 +- .../ImageBuildStatisticsCounterPhase.java | 8 +- .../phases/ImplicitAssertionsPhase.java | 36 +- .../phases/InjectedAccessorsPlugin.java | 8 +- .../InlineBeforeAnalysisGraphDecoderImpl.java | 8 +- .../InlineBeforeAnalysisPolicyImpl.java | 13 +- .../InlineBeforeAnalysisPolicyUtils.java | 52 +- ...trinsifyMethodHandlesInvocationPlugin.java | 136 +- .../phases/SharedGraphBuilderPhase.java | 68 +- .../hosted/phases/StrengthenStampsPhase.java | 40 +- .../SubstrateClassInitializationPlugin.java | 12 +- .../phases/SubstrateGraphBuilderPhase.java | 20 +- .../VerifyDeoptLIRFrameStatesPhase.java | 16 +- .../hosted/phases/VerifyNoGuardsPhase.java | 8 +- .../svm/hosted/reflect/AnnotationEncoder.java | 4 +- .../reflect/FoldedReflectionFeature.java | 2 +- .../ReflectionExpandSignatureMethod.java | 18 +- .../svm/hosted/reflect/ReflectionFeature.java | 6 +- .../hosted/reflect/ReflectionGraphKit.java | 56 +- .../ReflectionMetadataEncoderImpl.java | 6 +- .../serialize/SerializationFeature.java | 26 +- .../hosted/snippets/ReflectionPlugins.java | 24 +- .../SubstrateGraphBuilderPlugins.java | 116 +- .../hosted/substitute/AnnotatedMethod.java | 4 +- .../hosted/substitute/ComputedValueField.java | 2 +- .../substitute/DeletedFieldsPlugin.java | 12 +- .../svm/hosted/substitute/DeletedMethod.java | 14 +- .../PolymorphicSignatureWrapperMethod.java | 14 +- .../hosted/substitute/SubstitutionMethod.java | 4 +- .../UnsafeAutomaticSubstitutionProcessor.java | 60 +- .../svm/hosted/thread/CEntryPointFeature.java | 6 +- .../hosted/thread/VMThreadLocalCollector.java | 10 +- .../svm/hosted/thread/VMThreadMTFeature.java | 22 +- .../svm/hosted/thread/VMThreadSTFeature.java | 22 +- .../com/oracle/svm/junit/SVMJUnitRunner.java | 2 +- .../polyglot/scala/ScalaAnalysisPlugin.java | 6 +- .../svm/polyglot/scala/ScalaFeature.java | 6 +- ...tomaticallyRegisteredFeatureProcessor.java | 2 +- ...allyRegisteredImageSingletonProcessor.java | 2 +- .../oracle/svm/test/jfr/AbstractJfrTest.java | 9 - .../svm/test/jfr/TestVirtualThreadsBasic.java | 2 +- .../jfr/TestVirtualThreadsChunkRotation.java | 2 +- .../jfr/TestVirtualThreadsJfrStreaming.java | 2 +- .../poolparsers/ThreadConstantPoolParser.java | 2 +- .../svm/truffle/nfi/LocalNativeScope.java | 2 +- .../native-image/native-image.properties | 12 +- .../svm/truffle/tck/PermissionsFeature.java | 18 +- .../svm/truffle/tck/WhiteListParser.java | 2 +- .../HostedTruffleConstantFieldProvider.java | 2 +- .../truffle/SubstrateHostInliningPhase.java | 12 +- ...SubstrateTruffleCompilationIdentifier.java | 4 +- .../SubstrateTruffleHostEnvironment.java | 6 +- ...SubstrateTruffleHostEnvironmentLookup.java | 2 +- .../svm/truffle/TruffleBaseFeature.java | 40 +- .../oracle/svm/truffle/TruffleFeature.java | 48 +- .../oracle/svm/truffle/TruffleSupport.java | 16 +- .../api/SubstrateKnownTruffleTypes.java | 2 +- ...trateOptimizedCallTargetInstalledCode.java | 4 +- .../truffle/api/SubstratePEGraphDecoder.java | 22 +- .../api/SubstratePartialEvaluator.java | 32 +- .../SubstratePostPartialEvaluationSuite.java | 4 +- ...SubstrateThreadLocalHandshakeSnippets.java | 34 +- .../SubstrateTruffleCompilationSupport.java | 2 +- .../truffle/api/SubstrateTruffleCompiler.java | 4 +- .../api/SubstrateTruffleCompilerImpl.java | 34 +- .../SubstrateTruffleGraphBuilderPlugins.java | 10 +- .../truffle/api/SubstrateTruffleRuntime.java | 4 +- .../svm/truffle/api/TruffleBoundaryPhase.java | 18 +- .../isolated/IsolateAwareTruffleCompiler.java | 14 +- .../IsolatedCompilableTruffleAST.java | 2 +- .../IsolatedTruffleCompilationIdentifier.java | 4 +- .../oracle/svm/util/ImageBuildStatistics.java | 8 +- truffle/docs/BranchInstrumentation.md | 2 +- truffle/docs/HostCompilation.md | 20 +- truffle/docs/Inlining.md | 2 +- truffle/docs/Optimizing.md | 4 +- .../truffle/api/test/SubprocessTestUtils.java | 2 +- .../hotspot/libgraal/TruffleFromLibGraal.java | 5 +- .../TruffleFromLibGraalProcessor.java | 12 +- .../runtime/OptimizedRuntimeOptions.java | 7 +- .../hotspot/HotSpotTruffleRuntimeAccess.java | 24 +- .../jfr/impl/CompilationEventImpl.java | 2 +- .../jfr/impl/CompilationFailureEventImpl.java | 2 +- .../impl/CompilationStatisticsEventImpl.java | 2 +- .../jfr/impl/DeoptimizationEventImpl.java | 2 +- .../jfr/impl/InvalidationEventImpl.java | 2 +- .../TruffleRuntimeServices.java | 2 +- vm/mx.vm/mx_vm_gate.py | 6 +- .../graalvm/polybench/PolyBenchLauncher.java | 2 +- 4347 files changed, 37468 insertions(+), 38267 deletions(-) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/processor/MatchProcessor.java (96%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/processor/IntrinsicStubProcessor.java (94%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/processor/SyncPortProcessor.java (97%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/processor/ElementException.java (97%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/processor/GraphNodeProcessor.java (95%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/processor/GraphNodeVerifier.java (94%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/options/processor/OptionProcessor.java (96%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/processor/AbstractProcessor.java (99%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/processor/SuppressFBWarnings.java (97%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/APHotSpotSignature.java (99%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/AnnotationHandler.java (94%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/FoldHandler.java (87%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/GeneratedFoldPlugin.java (95%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/GeneratedNodeIntrinsicPlugin.java (88%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/GeneratedPlugin.java (97%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/InjectedDependencies.java (88%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/NodeIntrinsicHandler.java (91%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/PluginGenerator.java (86%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/processor/ReplacementsAnnotationProcessor.java (94%) rename compiler/src/jdk.internal.vm.compiler.processor/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/processor/ServiceProviderProcessor.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/BlackholeDirectiveTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/ConstantProbablityBranchFoldingTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/ControlFlowAnchorDirectiveTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/DeoptimizeDirectiveTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/GraalDirectiveIntrinsificationTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/IterationDirectiveTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/OpaqueDirectiveTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/ProbabilityDirectiveShortCircuitTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/ProbabilityDirectiveTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/test/SwitchCaseProbabilityDirectiveTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/test/ExportingClassLoader.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/test/Graal.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/test/GraalAPITest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/api/test/ModuleSupport.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/test/AArch64AddressingModeTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/test/AArch64BitCountAssemblerTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/test/AArch64InstructionEncodingTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/test/AArch64MoveConstantTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/test/TestProtectedAssembler.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/test/AMD64AssemblerUtilityTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/test/BitOpsTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/test/IncrementDecrementMacroTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/test/IndirectCallTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/test/SimpleAssemblerTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/test/AssemblerTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64AddSubShiftTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64ArrayAddressTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64BitFieldTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64BitwiseLogicalNotTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64CbzTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64ConditionalSetTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64ElideL2ITest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64FloatSqrtTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64LogicShiftTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MNegTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MatchRuleTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MembarOpTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MultiplyAddSubTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64MultiplyLongTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64NegateShiftTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64PairLoadStoreTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64RotationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64TestBitAndBranchTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/test/AArch64VolatileAccessesTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/test/AMD64AddressLoweringTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/test/AMD64AllocatorTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/test/AMD64MatchRuleTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/test/ConstantStackMoveTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/test/StackStoreTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/AbsCanonicalizationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/AllocSpy.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ArrayCopyVirtualizationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ArrayLengthProviderTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/BasePhaseBinaryGraphTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/BciBlockMappingTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/BoxingEliminationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/BoxingTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ByteBufferTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/BytecodeDisassemblerTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CanonicalizedConversionTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CheckGraalInvariants.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CommonedConstantsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CompareCanonicalizerTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CompareCanonicalizerTest2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CompareCanonicalizerTest3.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CompilationResultTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CompilationWatchDogTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConcreteSubtypeTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationMulTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationPiTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationRegressionTest.java (82%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationStampInversionTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest1.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest10.java (78%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest11.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest12.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest13.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest14.java (79%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest15.java (78%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest16.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest2.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest3.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest4.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest5.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest6.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest7.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest8.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTest9.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalEliminationTestBase.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConditionalNodeTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ConstantArrayReadFoldingTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CopyOfVirtualizationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CountedLoopMaxTripCountPiTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CountedLoopOverflowTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CountedLoopTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CountedLoopTest2.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/CustomizedBytecodePatternTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DeMorganCanonicalizationTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DeepUnrollingTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DegeneratedLoopsTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DirectByteBufferTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DontReuseArgumentSpaceTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DumpPathTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/DynamicConstantTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/EarlyGVNTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/EnumSwitchTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/EnumValuesTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FinalizableSubclassTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FindUniqueConcreteMethodBugTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FindUniqueDefaultMethodTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FloatOptimizationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FloatingDivTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FloatingReadTest.java (81%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FuzzTest36456.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/FuzzTest36457.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraalCompilerAssumptionsTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraalCompilerTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraalDebugHandlersFactoryTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraphDumpingTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraphEncoderTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraphPrinterTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraphResetDebugTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraphScheduleTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GraphUtilOriginalValueTests.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/GuardPrioritiesTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/HashCodeTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IfCanonicalizerSwapTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IfCanonicalizerTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IfReorderTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ImplicitNullCheckTest.java (77%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/InfopointReasonTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/InstalledCodeInvalidationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerBoxEqualsTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerDivPowerOf2Test.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerDivRemCanonicalizationTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerDivRemConstantTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerEqualsCanonicalizerTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerLowerThanCommonArithmeticTestBase.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerStampMulFoldTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IntegerStampShiftTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/InterfaceMethodHandleTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/InvocationPluginsTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/InvokeExceptionTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/InvokeHintsTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/IsArrayTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/LockEliminationTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/LongNodeChainTest.java (82%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/LoopFullUnrollTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/LoopUnswitchTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MarkUnsafeAccessTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MaskingOptimizationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MatchRuleTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MathCopySignStampTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MathSignumStampTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MemoryArithmeticTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MemoryGraphCanonicalizeTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MemoryScheduleTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MergeCanonicalizerTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MethodHandleEagerResolution.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MonitorGraphTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MoveGuardsLoopTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/MulNegateTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NarrowingReadTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NegateCanonicalizationTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NestedArithmeticTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NestedLoopTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NewInstanceTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NodeCopyWithInputsTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NodeMapGraphTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NodePosIteratorTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/NodePropertiesTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ObjectSubstitutionsTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/OffHeapUnsafeAccessTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/OnStackReplacementTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/OptimizeExtendsTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/OptimizedBoxNodeTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/OptionsVerifierTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/PhiCreationTests.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ProfilingInfoTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/PushNodesThroughPiTest.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/PushThroughIfTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReadAfterCheckCastTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReadConstantFoldingTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReadConstantFoldingTestGenerator.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReassociateAndCanonicalTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReassociationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReentrantBlockIteratorTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReferenceGetLoopTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReflectionOptionDescriptors.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ResolveDynamicConstantTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ReverseBytesIntoArrayRegressionTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ScalarTypeSystemTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SchedulingTest.java (79%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SchedulingTest2.java (78%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ShortCircuitNodeTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SimpleCFGTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SingleImplementorInterfaceTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SingleRunSubphaseTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SpectreFenceTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SpeculativeGuardMovementTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SpeculativeGuardMovementTrivialDeoptTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/StableArrayReadFoldingTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/StampCanonicalizerTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/StampMemoryAccessTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/StaticInterfaceFieldTest.java (74%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/StraighteningTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubWordArrayStoreTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubWordFieldStoreTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubWordInputTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubWordInputTest2.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubWordReturnTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubWordTestUtil.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SubprocessTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SwitchCanonicalizerTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SwitchDyingLoopTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SwitchFoldingTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/SwitchTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TestAutoboxConf.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TestBasePhase.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TestPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TrivialInliningExplosionTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TwoSlotMarkerClearingTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TypeSystemTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/TypeWriterTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnbalancedLockingTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnbalancedMonitorsTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UncheckedInterfaceProviderTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnsafeCopyMemoryTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnsafeGetStableArrayElement.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnsafeReadEliminationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnsafeVirtualizationTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnschedulableGraphTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnsignedLongTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/UnusedArray.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyArchUsageInPlugins.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyBailoutUsage.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyBailoutUsageTest.java (79%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyDebugUsage.java (69%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyDebugUsageTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyEndlessLoops.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyFoldableMethods.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyGetOptionsUsage.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyGraphUniqueUsages.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyInstanceOfUsage.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyIterableNodeType.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyMemoryKillCheck.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyPluginFrameState.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyProfileMethodUsage.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifySharedConstantEmptyArray.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifySnippetProbabilities.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyStatelessPhases.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyStringFormatterUsage.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifySystemPropertyUsage.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyUnsafeAccess.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyUpdateUsages.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyUsageWithEquals.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyVariableCasts.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyVirtualizableTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VerifyVirtualizableUsage.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VolatileAccessReadEliminationTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/VolatileReadEliminateWrongMemoryStateTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ZeroSignExtendTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/backend/AllocatorTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/backend/BackendTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/deopt/CompiledMethodTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/deopt/MonitorDeoptTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/deopt/RethrowDeoptMaterializeTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/deopt/RethrowExceptionLoopTest.java (80%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/deopt/SafepointRethrowDeoptTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/deopt/SynchronizedMethodDeoptimizationTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/AtomicVirtualizationTests.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/CountUppercaseParallelTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/EAMergingTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/EATestBase.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/EscapeAnalysisTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/ExpandLogicTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/NestedBoxingTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PEAAssertionsTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PEAReadEliminationTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PartialEscapeAnalysisIterationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PartialEscapeAnalysisTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PartialEscapeAnalysisTreesTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PartialEscapeOptimizationLogTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PartialEscapeUnsafeStoreTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PartialEscapeWithExceptionTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/PoorMansEATest.java (81%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/ReadEliminationTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/TrufflePEATest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/ea/UnsafeEATest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/inlining/InliningTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/jfr/TestGetEventWriter.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/tutorial/GraalTutorial.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/tutorial/InvokeGraal.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/tutorial/StaticAnalysis.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/core/test/tutorial/StaticAnalysisTests.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/CSVUtilTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/CompilationAlarmTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/DebugContextTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/DebugContextTest.testLogging.input (100%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/GraalErrorTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/LogStreamTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/TTYTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/TimerKeyTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/test/VersionsTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/GraphTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeBitMapTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeFormatToTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeInputListTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeMapTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeUnionFindTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeUsageIterableTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeUsagesTests.java (57%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/NodeValidationChecksTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/TestNodeInterface.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/TypedNodeIteratorTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/TypedNodeIteratorTest2.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/graphio/GraphOutputTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/graphio/GraphSnippetTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/graphio/NodeEncodingTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/matchers/NodeIterableContains.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/matchers/NodeIterableCount.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/test/matchers/NodeIterableIsEmpty.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/test/AArch64UncompressPointerTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/BinaryMathStubTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/BmiAndn.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/BmiBlsi.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/BmiBlsmsk.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/BmiBlsr.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/BmiCompilerTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/CompressedNullCheckTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/DataPatchInConstantsTest.java (82%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/MathPower0Point5Test.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/NumberOfTrailingZeroings003.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/StubAVXTest.java (80%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/test/UnaryMathStubTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/lir/test/BenchmarkCounterOverflowTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/lir/test/ExceedMaxOopMapStackOffset.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/Adler32SubstitutionsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ArrayCopyIntrinsificationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ArrayNewInstanceTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/Base64SubstitutionsTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/BigIntegerIntrinsicsTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/BoxDeoptimizationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CRC32CSubstitutionsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CRC32SubstitutionsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CheckGraalIntrinsics.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CheckIndexLongTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ClassReplacementsTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ClassSubstitutionsTests.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CompilationWrapperTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CompileTheWorld.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CompileTheWorldTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/CompressedOopTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/DataPatchTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/DeferredBarrierAdditionTest.java (77%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/DeoptimizeReasonAccountingTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ExplicitExceptionTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ForeignCallDeoptimizeTest.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/GCStressTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/GraalHotSpotVMConfigAccessTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/GraalOSRLockTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/GraalOSRTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/GraalOSRTestBase.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/GraalOnlyIntrinsicsTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotBase64Test.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotClassInitializationTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotCryptoSubstitutionTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotDeoptExplicitExceptions.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotDeoptPostExceptions.java (77%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotGHASHTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotGraalCompilerTest.java (81%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotGraalOptionValuesTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotInvokeJavaMethodTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotManagedFailedSpeculationListTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotMethodSubstitutionTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotMonitorValueTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotNmethodTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotNodeSubstitutionsTest.java (75%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotObjectSizeTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotResolvedObjectTypeTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotStackIntrospectionTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotStampMemoryAccessTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotStubsTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HotSpotUnsafeSubstitutionTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/HsErrLogTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/InstalledCodeExecuteHelperTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/JVMCIInfopointErrorTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/JVMCIVersionCheckMaxValueTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/JVMCIVersionCheckTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/LambdaStableNameTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/LibGraalCompilerTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/LogNodeTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/MathDoubleFMATest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/MathFMAConstantInputTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/MathFloatFMATest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/MemoryUsageBenchmark.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ObjectCloneTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ObjectHashCodeInliningTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/OptionsInFileTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/PolymorphicInliningTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ProfileReplayTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/RangeCheckPredicatesTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ReferenceTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/ReservedStackAccessTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/StringInternConstantTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/StringUTF16ToBytesGetCharsTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/TestIntrinsicCompiles.java (79%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/UnsafeNewArrayTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/UnsafeWritebackMemoryTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/VirtualThreadCarrierThreadTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/VirtualThreadJFRTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/test/WriteBarrierAdditionTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/JTTTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/backend/ConstantPhiTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/backend/EmptyMethodTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/backend/LargeConstantSectionTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aaload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aaload_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aastore.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aload_0.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aload_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aload_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_aload_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_anewarray.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_areturn.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_arraylength.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_athrow.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_baload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_bastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_caload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_castore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_checkcast01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_checkcast02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_checkcast03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_d2f.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_d2i01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_d2i02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_d2l01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_d2l02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_d2l03.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dadd.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_daload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp05.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp06.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp07.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp08.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp09.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dcmp10.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ddiv.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dmul.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dneg.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dneg2.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_double_base.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_drem.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dreturn.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dsub.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_dsub2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_f2d.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_f2i01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_f2i02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_f2l01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_f2l02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fadd.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_faload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp05.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp06.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp07.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp08.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp09.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fcmp10.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fdiv.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fload_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_float_base.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fmul.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fneg.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_frem.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_freturn.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_fsub.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_b.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_c.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_d.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_f.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_i.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_l.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_o.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_s.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getfield_z.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_b.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_c.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_d.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_f.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_i.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_l.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_s.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_getstatic_z.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_i2b.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_i2c.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_i2d.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_i2f.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_i2l.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_i2s.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd3.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd_const0.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd_const1.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd_const2.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iadd_const3.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iaload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iand.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iconst.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_idiv.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_idiv2.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_idiv_overflow.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifeq.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifeq_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifeq_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifge.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifge_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifge_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifgt.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ificmplt1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ificmplt2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ificmpne1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ificmpne2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifle.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iflt.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifne.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifnonnull.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifnonnull_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifnonnull_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifnull.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifnull_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ifnull_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iinc_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iinc_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iinc_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iinc_4.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_0.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_0_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_0_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_1_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iload_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_imul.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ineg.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_instanceof.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_instanceof01.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_invokeinterface.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_invokespecial.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_invokespecial2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_invokestatic.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_invokevirtual.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ior.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_irem.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_irem2.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_irem3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_irem4.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ireturn.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ishl.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ishr.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_isub.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_iushr.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ixor.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_l2d.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_l2f.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_l2i.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_l2i_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ladd.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ladd2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_laload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_land.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lcmp.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldc_01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldc_02.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldc_03.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldc_04.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldc_05.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldc_06.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldiv.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldiv2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldiv3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_ldiv_overflow.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lload_0.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lload_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lload_1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lload_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lload_3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lmul.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lneg.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lookupswitch01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lookupswitch02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lookupswitch03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lookupswitch04.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lookupswitch05.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lor.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lrem.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lrem2.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lreturn.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lshl.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lshr.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lshr02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lsub.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lushr.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_lxor.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_monitorenter.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_monitorenter02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_multianewarray01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_multianewarray02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_multianewarray03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_multianewarray04.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_new.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_newarray.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_newarray_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_putfield_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_putfield_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_putfield_03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_putfield_04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_putstatic.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_saload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_sastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_tableswitch.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_tableswitch2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_tableswitch3.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_tableswitch4.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_wide01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/bytecode/BC_wide02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_aaload0.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_aaload1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_aastore0.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_aastore1.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_anewarray.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_arraylength.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_athrow0.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_athrow1.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_athrow2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_athrow3.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_baload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_bastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_caload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_castore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast1.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast3.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast4.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast5.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_checkcast6.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_daload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_dastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_faload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_fastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_getfield.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_getfield1.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_iaload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_iastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_idiv.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_idiv2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_invokespecial01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_invokevirtual01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_invokevirtual02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_irem.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_laload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_lastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_ldiv.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_ldiv2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_lrem.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_monitorenter.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_multianewarray.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_newarray.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_putfield.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_saload.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/BC_sastore.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Loop01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Loop02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Loop03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NASE_1.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NASE_2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_00.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_05.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_06.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_07.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_08.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_09.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_10.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_NPE_11.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_StackOverflowError_01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_StackOverflowError_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_StackOverflowError_03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Two01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Two02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Two03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Unresolved.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Unresolved01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Unresolved02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Catch_Unresolved03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Except_Locals.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Except_Synchronized01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Except_Synchronized02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Except_Synchronized03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Except_Synchronized04.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Except_Synchronized05.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Finally01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Finally02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/StackTrace_AIOOBE_00.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/StackTrace_CCE_00.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/StackTrace_NPE_00.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/StackTrace_NPE_01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/StackTrace_NPE_02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/StackTrace_NPE_03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_InCatch01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_InCatch02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_InCatch03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_InNested.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_NPE_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_Synchronized01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_Synchronized02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_Synchronized03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_Synchronized04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/Throw_Synchronized05.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/except/UntrustedInterfaces.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_allocate01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_allocate02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_allocate03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_allocate04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_array01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_array02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_array03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_array04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_control01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_control02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_convert01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_count.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_dead01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_demo01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_field01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_field02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_field03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_field04.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_idea.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_inline01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_inline02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_invoke01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_life.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_nest01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_nest02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_scope01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_scope02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_series.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotpath/HP_trees01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test6186134.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test6196102.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test6753639.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test6823354.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test6850611.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test6959129.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/hotspot/Test7005594.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/CharacterBits.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/Class_getName.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/DivideUnsigned.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/EnumMap01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/EnumMap02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/IntegerBits.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/IntegerShuffleBitsTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/LongBits.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/LongShuffleBitsTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/ShortBits.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/System_currentTimeMillis01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/System_currentTimeMillis02.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/System_nanoTime01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/System_nanoTime02.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/System_setOut.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/Thread_setName.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/UnsafeAccess01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/UnsafeAllocateInstance01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/Unsafe_compareAndSwap.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/jdk/Unsafe_compareAndSwapNullCheck.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Boxed_TYPE_01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Bridge_method01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/CheckedListTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/ClassLoader_loadClass01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_Literal01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_asSubclass01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_cast01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_cast02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_forName01.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_forName02.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_forName03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_forName04.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_forName05.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getComponentType01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getInterfaces01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getModifiers01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getModifiers02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getName01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getName02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getSimpleName01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getSimpleName02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_getSuperClass01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isArray01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isAssignableFrom01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isAssignableFrom02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isAssignableFrom03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance04.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance05.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance06.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInstance07.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isInterface01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Class_isPrimitive01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Double_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Double_conditional.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Double_isInfinite.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Double_toString.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Float_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Float_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Float_03.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Float_conditional.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Float_isInfinite.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_greater01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_greater02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_greater03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_greaterEqual01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_greaterEqual02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_greaterEqual03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_less01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_less02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_less03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_lessEqual01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_lessEqual02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_lessEqual03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Int_reverseBits.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/JDK_ClassLoaders01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/JDK_ClassLoaders02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/LambdaEagerTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_greater01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_greater02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_greater03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_greaterEqual01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_greaterEqual02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_greaterEqual03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_less01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_less02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_less03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_lessEqual01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_lessEqual02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_lessEqual03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_reverseBits.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_reverseBytes01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Long_reverseBytes02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_abs.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_copySign.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_cos.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_exact.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_exp.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_log.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_log10.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_minMax.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_pow.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_round.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_signum.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_sin.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_sqrt.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Math_tan.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_clone01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_clone02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_equals01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_getClass01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_hashCode01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_hashCode02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_notify01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_notify02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_notifyAll01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_notifyAll02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_toString01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_toString02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_wait01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_wait02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/Object_wait03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/ProcessEnvironment_init.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/StringCoding_Scale.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/String_intern01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/String_intern02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/String_intern03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/String_valueOf01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/System_identityHashCode01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/lang/UnaryMath.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/DegeneratedLoop.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop05.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop06.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop07.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop07_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop08.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop09.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop09_2.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop11.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop12.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop13.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop14.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop15.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop16.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/Loop17.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopEscape.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopInline.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopLastIndexOf.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopNewInstance.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopParseLong.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopPhi.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopPhiResolutionTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopSpilling.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopSwitch01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/LoopUnroll.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/loop/SpillLoopPhiVariableAtDefinition.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/ArrayCompare01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/ArrayCompare02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BC_invokevirtual2.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigByteParams01.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigDoubleParams02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigFloatParams01.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigFloatParams02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigIntParams01.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigIntParams02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigInterfaceParams01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigLongParams02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigMixedParams01.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigMixedParams02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigMixedParams03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigMixedParams04.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigObjectParams01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigObjectParams02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigParamsAlignment.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigShortParams01.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/BigVirtualParams01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/Bubblesort.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/ConstantLoadTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/Fibonacci.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/FloatingReads.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/InvokeInterface_01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/InvokeInterface_02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/InvokeInterface_03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/InvokeInterface_04.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/InvokeVirtual_01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/InvokeVirtual_02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/Matrix01.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/ReferenceMap01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/StrangeFrames.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/String_format01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/String_format02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_String01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_Unroll.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_boolean01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_byte01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_char01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_double01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_float01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_int01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_long01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/micro/VarArgs_short01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ABCE_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ABCE_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ABCE_03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopy01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopy02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopy03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopy04.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopy05.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopy06.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayCopyGeneric.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ArrayLength01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_idiv_16.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_idiv_4.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_imul_16.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_imul_4.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_ldiv_16.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_ldiv_4.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_lmul_16.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_lmul_4.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_lshr_C16.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_lshr_C24.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BC_lshr_C32.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BlockSkip01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/BoxingIdentity.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/CE_InstanceOf.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Cmov01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Cmov02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Conditional01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ConditionalElimination01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ConditionalElimination02.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ConvertCompare.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/DeadCode01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/DeadCode02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Cast01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Convert01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Convert02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Convert03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Convert04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Double01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Double02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Double03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Double04.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Float01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Float02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Float03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_InstanceOf01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Int01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Int02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Long01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Long02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Fold_Math01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/GuardMovement.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/IfNodeCanonicalizationsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/InferStamp01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Inline01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Inline02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/InstanceOf.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/LLE_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/List_reorder_bug.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Logic0.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/LongToSomethingArray01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_FlowSensitive01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_FlowSensitive02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_FlowSensitive03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_FlowSensitive04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NCE_FlowSensitive05.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_byte01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_byte02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_byte03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_byte04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_char01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_char02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_char03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_short01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_short02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Narrow_short03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/NestedLoop_EA.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Phi01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Phi02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Phi03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/ReassociateConstants.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Convert01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Double01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Float01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Int01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Int02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Int03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Int04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_IntShift01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_IntShift02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Long01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Long02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Long03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_Long04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_LongShift01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Reduce_LongShift02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/SchedulingBug_01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/SignExtendShort.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Switch01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/Switch02.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/SwitchHashTableTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/TrichotomyFloats.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/TrichotomyTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/TypeCastElem.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/UnsafeDeopt.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Cast01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Cast02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Convert01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Convert02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Double01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Double02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Double03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Field01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Field02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Float01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Float02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_InstanceOf01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_InstanceOf02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_InstanceOf03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Int01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Int02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Int03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Long01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Long02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Long03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/optimize/VN_Loop01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_get01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_get02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_get03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getBoolean01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getByte01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getChar01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getDouble01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getFloat01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getInt01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getLength01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getLong01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_getShort01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_newInstance01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_newInstance02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_newInstance03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_newInstance04.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_newInstance05.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_newInstance06.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_set01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_set02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_set03.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setBoolean01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setByte01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setChar01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setDouble01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setFloat01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setInt01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setLong01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Array_setShort01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_getDeclaredField01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_getDeclaredMethod01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_getField01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_getField02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_getMethod01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_getMethod02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_newInstance01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_newInstance02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_newInstance03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_newInstance06.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Class_newInstance07.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_get01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_get02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_get03.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_get04.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_getType01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_set01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_set02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Field_set03.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Invoke_except01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Invoke_main01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Invoke_main02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Invoke_main03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Invoke_virtual01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Method_getParameterTypes01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/reflect/Method_getReturnType01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Monitor_contended01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Monitor_notowner01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Monitorenter01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Monitorenter02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Object_wait01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Object_wait02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Object_wait03.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Object_wait04.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/SynchronizedLoopExit01.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/SynchronizedParserInlineTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/ThreadLocal01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/ThreadLocal02.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/ThreadLocal03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_currentThread01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_getState01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_getState02.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_holdsLock01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_isAlive01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_isInterrupted01.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_isInterrupted02.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_isInterrupted03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_isInterrupted04.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_isInterrupted05.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_join01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_join02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_join03.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_new01.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_new02.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_setPriority01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_sleep01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/jtt/threads/Thread_yield01.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/jtt/ConstantStackCastTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/jtt/LIRTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/jtt/LIRTestSpecification.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/jtt/LIRTestTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/jtt/StackMoveTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/jtt/StackStoreLoadTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/test/CompositeValueReplacementTest1.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/test/GenericValueMapTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/test/LoopPartialUnrollTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/test/LoopsDataTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/AbstractObjectStampTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/AddNodeTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/AndNodeCanonicalizationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/CompareZeroExtendWithConstantTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ConstantNodeTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ExceptionLivenessTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/FloatStampTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/GraphStateTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/IfNodeCanonicalizationTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/IfNodeCanonicalizationTest2.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/InliningLogTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/IntegerShuffleBitsStampTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/IntegerStampFoldTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/IntegerStampMaskTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/IntegerStampTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/LongShuffleBitsStampTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/LoopLivenessTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/LoopPhiCanonicalizerTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/NarrowPreservesOrderTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/NarrowTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/NegateNodeCanonicalizationTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ObjectStampJoinTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ObjectStampMeetTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ObjectStampTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/OptimizationLogTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/OrNodeCanonicalizationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/PrimitiveStampBoundaryTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ReinterpretStampDoubleToLongTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ReinterpretStampFloatToIntTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ReinterpretStampIntToFloatTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ReinterpretStampLongToDoubleTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ReinterpretStampTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/ShortCircuitOrNodeTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/StampInverterTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/StampToolTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/StaticFieldAccessTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/StructuredGraphTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/SubCanonicalizationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/TruncateCanonicalizationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/test/XorNodeCanonicalizationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/options/test/NestedBooleanOptionKeyTest.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/options/test/TestOptionKey.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/test/StampFactoryTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ArrayCopyExceptionSeenTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ArrayEqualsConstantLengthTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ArrayStoreBytecodeExceptionTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ArraysSubstitutionsTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ArraysSubstitutionsTestBase.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/BitOpNodesTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/BytecodeExceptionTest.java (80%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/CharIsDigitTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/CheckIndexTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ClassCastBytecodeExceptionTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/CompiledExceptionHandlerTest.java (83%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/CompiledNullPointerExceptionTest.java (75%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/CountPositivesTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/DeoptimizeOnExceptionTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/DeoptimizeOnIntegerExactTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/DeoptimizeOnVolatileReadTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/DerivedOopTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/DynamicNewArrayTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/EdgesTest.java (81%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/EncodeArrayTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/FloatArraysEqualsTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/HalfFloatTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/HasNegativesTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/IndexOobBytecodeExceptionTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/InstanceOfDynamicTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/InstanceOfTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/IntegerExactExceptionTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/IntegerExactFoldTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/IntegerSubOverflowsTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/InvokeTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/InvokerSignatureMismatchTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/MathMultiplyHighTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/MathRoundTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/MethodHandleImplTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/MethodHandleMacroTest.java (86%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/MethodSubstitutionTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/MonitorTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/NestedExceptionHandlerTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/NewArrayTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/NewInstanceTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/NewMultiArrayTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/NullBytecodeExceptionTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ObjectAccessTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/PEGraphDecoderTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/PointerTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/PointerTrackingTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/ReplacementsTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/SnippetsTest.java (78%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StandardMethodSubstitutionsTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringCompareToAVX512Test.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringCompareToTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringCompressInflateTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringEqualsConstantTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringEqualsTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringGetBytesTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringHashConstantTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIndexOfCharConstantBindingTest.java (88%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIndexOfCharTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIndexOfConstantTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIndexOfDeoptimizeTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIndexOfTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIndexOfTestBase.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringIntrinsicRangeChecksTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringSubstitutionTestBase.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/StringSubstitutionsTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/SubstitutionNodeSourcePositionTest.java (73%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/SystemArrayCopyTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/TypeCheckTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnsafeBooleanAccessTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnsafeObjectReplacementsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnsafeReplacementsTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnsafeSubstitutionsTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnsignedIntegerTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnsignedMathTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/UnwindExceptionToCallerTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/VarHandleTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/VectorizedHashCodeTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/WordTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/test/classfile/ClassfileBytecodeProviderTest.java (82%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/AddExports.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/AddJVM.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/AddModules.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/CommandLine.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/CountUppercase.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/GraalTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/test/SubprocessUtil.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AOTSupportCompilationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AbstractSplittingStrategyTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AddExports.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AgnosticInliningPhaseTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AllocationReporterPartialEvaluationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ArrayUtilsIndexOfWithMaskTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ArrayUtilsTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AssumedValuePartialEvaluationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/AssumptionPartialEvaluationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/BailoutPartialEvaluationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/BeginNodeOptimizationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/BytecodeInterpreterPartialEvaluationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/BytecodeOSRNodeTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CachedLibraryCompilationTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CastExactPartialEvaluationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CodeInvalidationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilationFinalPartialEvaluationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilationMemoryTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilerAssertsTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilerDirectivesTypeTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilerInitializationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilerLoggingTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/CompilerOptionTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ConditionAnchoringTest.java (77%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ContextLookupCompilationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ControlFlowExceptionPartialEvaluationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/DFAPartialEvaluationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/DefaultLoomTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/DeoptInvalidateListener.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/DynamicObjectPartialEvaluationTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/EncodedGraphCacheTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/EngineModeTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/EnumPartialEvaluationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ExactMathTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ExceptionActionTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ExecutionListenerCompilerTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ExitDuringCompilationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ExplodeLoopBlockDuplicationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/FinalBitSetCompilationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/FlushEngineQueueTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/FrameAccessVerificationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/FrameDescriptorTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/FrameHostReadsTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/GR35581Test.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/GR36613Test.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/GenerateInlineCompilationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/GetRootNodeCompilationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/GraalTruffleRuntimeListenerTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/HashCodeIntrinsicTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/HostInliningBytecodeInterpreterExampleTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/HostInliningBytecodeInterpreterTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/HostInliningTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/IndirectCallSiteTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/InstrumentBranchesPhaseTest.java (85%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/InstrumentationCompilerTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LanguageContextFreedTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LazyClassLoadingTargetNegativeTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LazyClassLoadingTargetPositiveTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LazyClassLoadingTest.java (84%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LibraryCompilationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LibraryInheritanceCompilationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LibrarySplittingStrategyTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LoomUtils.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LoopNodeOSRTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LoopNodePartialEvaluationTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/MaterializedFrameTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/MergeExplodeProxyTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/MultiTierAssumptionInvalidationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/MultiTierCompilationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/NodeLibraryCompilerTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/NodeLibrarySLCompilerTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/NodeLimitTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/NodeSplittingStrategyTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/OSRCancelTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/OptimizedBlockNodeTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/OptimizedCallTargetTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/OptimizedLoomTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/OptimizedOSRLoopNodeTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/OverrideOptionsTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PartialEvaluationTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PerformanceWarningTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PhiStampInferencePartialEvaluationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PhiTransformTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PolyglotEngineOptionsTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PolyglotHostObjectPartialEvaluationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ResourceLimitsCompilationTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/RewriteDuringCompilationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/SLCompileImmediatelyTestSuite.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/SLTruffleGraalTestSuite.java (76%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/SafepointRethrowDeoptPETest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/SimplePartialEvaluationTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/StaticObjectCompilationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/StringNodeInliningCompilationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TestWithPolyglotOptions.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TestWithSynchronousCompiling.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/ThreadsActivationCompilationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TraceCompilationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TransferToInterpreterTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleBoundaryExceptionsTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleBoundaryInliningTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleCompilerImplTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleContextCompilationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleDirectCallNodeTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleEnsureVirtualizedTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleExceptionPartialEvaluationTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleHostInliningTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleLoggerPartialEvaluationTest.java (90%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleOptionsByClassLoaderTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleReturnBoxedParameterTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleRuntimeTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleShutdownHookTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/TruffleValueTypeTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/UnrollLoopBlockDuplicationTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/VarHandlePartialEvaluationTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLAssertFalseBuiltin.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLAssertTrueBuiltin.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLAssertionError.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLCallFunctionsWithBuiltin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLDisableSplittingBuiltin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLGetOptionBuiltin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLGraalRuntimeBuiltin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLIsCompilationConstantBuiltin.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLIsOptimizedBuiltin.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/builtins/SLWaitForOptimizationBuiltin.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/collection/BTreeQueueTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/collection/DelegatingBlockingQueueTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/inlining/InlineOnlyTest.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/inlining/InliningTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/libgraal/JNIExceptionWrapperTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/AbstractTestNode.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/AddTestNode.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/AssumptionCutsBranchTestNode.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/BlockTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/ConstantTestNode.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/ConstantWithAssumptionTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/ExplodeLoopUntilReturnNode.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/InliningNullCheckNode1.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/InliningNullCheckNode2.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/IsLoggableNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/LambdaTestNode.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/LoadLocalTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/LoggingNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/LoopTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/NeverPartOfCompilationTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/NonConstantTestNode.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/ObjectEqualsNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/ObjectHashCodeNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/PartialIntrinsicNode.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/RecursionTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/RootTestNode.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/StoreLocalTestNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/StringEqualsNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/StringHashCodeFinalNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/StringHashCodeNonFinalNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/SynchronizedExceptionMergeNode.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/TestNodeFactory.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/UnrollLoopUntilReturnNode.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/explosion/LoopExplosionPhiNode.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/nodes/explosion/UnrollingTestNode.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringConstantFoldingTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCompareConstantStrideTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCompareConstantTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCompareTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCopyConstantStrideTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCopyReturnValueTest.java (95%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsCopyTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java (93%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsIndexOfAnyTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsIndexOfTableTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java (91%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java (89%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java (92%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsRegionEqualsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringOpsTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/TStringTest.java (87%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/strings/VectorizedMismatchTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/tregex/TRegexTStringVirtualizationTest.java (94%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm => jdk/compiler/graal}/util/test/AddModulesTest.java (96%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm => jdk/compiler/graal}/util/test/CollectionSizeTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm => jdk/compiler/graal}/util/test/CollectionUtilTest.java (98%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm => jdk/compiler/graal}/util/test/JSONParserTest.java (97%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm => jdk/compiler/graal}/util/test/ObjectSizeEstimate.java (99%) rename compiler/src/jdk.internal.vm.compiler.test/src/{org/graalvm => jdk/compiler/graal}/util/test/OptionsEncoderTest.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/directives/GraalDirectives.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/replacements/Fold.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/replacements/Snippet.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/replacements/SnippetReflectionProvider.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/replacements/SnippetTemplateCache.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/runtime/GraalJVMCICompiler.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/api/runtime/GraalRuntime.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/AbstractAddress.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/AsmOptions.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/Assembler.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/BranchTargetOutOfBoundsException.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/Buffer.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/Label.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/VectorSize.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/AArch64ASIMDAssembler.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/AArch64ASIMDMacroAssembler.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/AArch64Address.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/AArch64Assembler.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/AArch64MacroAssembler.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/aarch64/ASIMDKind.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/AMD64Address.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/AMD64Assembler.java (69%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/AMD64BaseAssembler.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/AMD64MacroAssembler.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/asm/amd64/AVXKind.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BridgeMethodUtils.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/Bytecode.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BytecodeDisassembler.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BytecodeLookupSwitch.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BytecodeProvider.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BytecodeStream.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BytecodeSwitch.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/BytecodeTableSwitch.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/Bytecodes.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/Bytes.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/OWNERS.toml (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/ResolvedJavaMethodBytecode.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/bytecode/ResolvedJavaMethodBytecodeProvider.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/CompilationResult.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/DataSection.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/DisassemblerProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/HexCodeFile.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/HexCodeFileDisassemblerProvider.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/ObjdumpDisassemblerProvider.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/SourceMapping.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/code/SourceStackTraceBailoutException.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/CompilationPrinter.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/CompilationWatchDog.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/CompilationWrapper.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/CompilerThread.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/CompilerThreadFactory.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/GraalCompiler.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/GraalCompilerOptions.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/GraalServiceThread.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/Instrumentation.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/LIRGenerationPhase.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64AddressLoweringByUse.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64AddressNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64ArithmeticLIRGenerator.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64BarrierSetLIRGenerator.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64LIRGenerator.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64LIRKindTool.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64LoweringProviderMixin.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64MoveFactory.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64NodeLIRBuilder.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64NodeMatchRules.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64PointerAddNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/aarch64/AArch64SuitesCreator.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64AddressLowering.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64AddressNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64ArithmeticLIRGenerator.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64BarrierSetLIRGenerator.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64CompressAddressLowering.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64LIRGenerator.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64LIRKindTool.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64LoweringProviderMixin.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64MoveFactory.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64MoveFactoryBase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64NodeLIRBuilder.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64NodeMatchRules.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/AMD64SuitesCreator.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/amd64/UseTrappingDivPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/BootstrapMethodIntrospection.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/CancellationBailoutException.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/CompilationIdentifier.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/CompilationListenerProfiler.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/CompilationRequestIdentifier.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/CompilerProfiler.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/CompressEncoding.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/FieldIntrospection.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/Fields.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/FieldsScanner.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/GraalBailoutException.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/GraalOptions.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/LIRKind.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/LIRKindWithCast.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/NumUtil.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/PermanentBailoutException.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/RetryableBailoutException.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/SpectrePHTMitigations.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/Stride.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/StrideUtil.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/SuppressFBWarnings.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/SuppressSVMWarnings.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/alloc/BasicBlockOrderUtils.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/alloc/DefaultCodeEmissionOrder.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/alloc/LinearScanOrder.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/alloc/RegisterAllocationConfig.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/calc/CanonicalCondition.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/calc/Condition.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/calc/FloatConvert.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/calc/FloatConvertCategory.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/calc/ReinterpretUtils.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/calc/UnsignedMath.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/AbstractControlFlowGraph.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/BasicBlock.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/BasicBlockSet.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/BlockMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/CFGVerifier.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/CodeEmissionOrder.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/DominatorOptimizationProblem.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/Loop.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/cfg/PropertyConsumable.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/doc-files/TraceInliningHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/memory/BarrierType.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/memory/MemoryExtendKind.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/memory/MemoryOrderMode.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/CodeGenProviders.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/ConstantFieldProvider.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/ForeignCallDescriptor.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/ForeignCallLinkage.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/ForeignCallSignature.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/ForeignCallsProvider.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/JavaConstantFieldProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/LIRKindTool.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/spi/MetaAccessExtensionProvider.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/AbstractObjectStamp.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/AbstractPointerStamp.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/ArithmeticOpTable.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/ArithmeticStamp.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/CompressibleConstant.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/DataPointerConstant.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/FloatStamp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/IllegalStamp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/IntegerStamp.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/ObjectStamp.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/PrimitiveStamp.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/RawPointerStamp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/Stamp.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/StampFactory.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/StampPair.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/SymbolicJVMCIReference.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/TypeReference.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/TypedConstant.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/type/VoidStamp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/AbstractTypeReader.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/BitMap2D.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/CompilationAlarm.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/EventCounter.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/FieldKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/FrequencyEncoder.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/IntList.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/MethodKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/PhasePlan.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/ReversedList.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/TypeConversion.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/TypeReader.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/TypeWriter.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/UnsafeArrayTypeReader.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/UnsafeArrayTypeWriter.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/UnsignedLong.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/common/util/Util.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/doc-files/CompilationFailureActionHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/BytecodeParserTool.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/DebugInfoBuilder.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/InstructionPrinter.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/LIRCompilerBackend.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/LIRGenerationProvider.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/NodeLIRBuilder.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/NodeMatchRules.java (71%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/gen/package-info.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/ComplexMatchResult.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/ComplexMatchValue.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchContext.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchGenerator.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchPattern.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchRule.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchRuleRegistry.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchRules.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchStatement.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchStatementSet.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchableNode.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/match/MatchableNodes.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/package-info.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/BaseTier.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/CEOptimization.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/CommunityCompilerConfiguration.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/EconomyCompilerConfiguration.java (70%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/EconomyHighTier.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/EconomyLowTier.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/EconomyMidTier.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/HighTier.java (56%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/LowTier.java (72%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/MidTier.java (50%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/AbstractCompilationPlan.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/AbstractTierPlan.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/FullFuzzedCompilationPlan.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/FullFuzzedTierPlan.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/FuzzedSuites.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/MinimalFuzzedTierPlan.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/phases/fuzzing/PhasePlanSerializer.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/riscv64/RISCV64LoweringProviderMixin.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/riscv64/RISCV64NodeMatchRules.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/riscv64/RISCV64ReflectionUtil.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/riscv64/ShadowedRISCV64.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/core/target/Backend.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/AbstractKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/AccumulatedKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/Assertions.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/CSVUtil.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/CausableByCompilerAssert.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/CloseableCounter.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/CompilationListener.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/CounterKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/CounterKeyImpl.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugCloseable.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugConfig.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugConfigImpl.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugContext.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugDumpHandler.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugDumpScope.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugFilter.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugHandler.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugHandlersFactory.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugOptions.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DebugVerifyHandler.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/DiagnosticsOutputDirectory.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/GlobalMetrics.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/GraalError.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/IgvDumpChannel.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/Indent.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/JavaMethodContext.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/KeyRegistry.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/LogStream.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/MemUseTrackerKey.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/MemUseTrackerKeyImpl.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/MethodFilter.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/MetricKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/PathUtilities.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/PathUtilitiesProvider.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/ScopeImpl.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/StandardPathUtilitiesProvider.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/TTY.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/TTYStreamProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/TimeSource.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/TimerKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/TimerKeyImpl.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/Versions.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/doc-files/DumpHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/doc-files/MethodFilterHelp.txt (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/doc-files/MetricsFileHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/doc-files/OptimizationLogHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/debug/doc-files/PrintGraphHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/Edges.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/GraalGraphError.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/Graph.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/GraphNodeIterator.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/InputEdges.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/IterableNodeType.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/LinkedStack.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/MemoryKillMarker.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/Node.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeBitMap.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeClass.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeFlood.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeIdAccessor.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeInputList.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeList.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeMap.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeSourcePosition.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeStack.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeSuccessorList.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeUnionFind.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeUsageIterable.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeUsageIterator.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeUsageWithModCountIterator.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/NodeWorkList.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/Position.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/SourceLanguagePosition.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/SourceLanguagePositionProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/SuccessorEdges.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/TypedGraphNodeIterator.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/iterators/FilteredNodeIterable.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/iterators/NodeIterable.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/iterators/NodeIterator.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/iterators/NodePredicate.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/iterators/NodePredicates.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/iterators/PredicatedProxyNodeIterator.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/package-info.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/spi/BinaryCommutativeMarker.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/spi/CanonicalizableMarker.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/spi/NodeWithIdentity.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/graph/spi/SimplifiableMarker.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/DefaultGraphBlocks.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/DefaultGraphTypes.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphBlocks.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphElements.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphJavadocSnippets.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphLocations.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphOutput.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphProtocol.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphStructure.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/GraphTypes.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/ProtocolImpl.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/doc-files/diamond.png (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/graphio/package-info.java (64%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/CodeBuffer.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/CodeGenTool.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/Emitter.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/IEmitter.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/Keyword.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/NodeLowerer.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/irwalk/BasicBlockInterpreter.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/irwalk/BlockNestingVerifier.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/irwalk/BlockVisitHistory.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/irwalk/IRWalkVerifier.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/irwalk/IRWalker.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/irwalk/StackifierIRWalker.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/lowerer/CommitAllocationLowerer.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/lowerer/MoveResolver.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/lowerer/PhiResolveLowerer.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/ReconstructionData.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/ReconstructionPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/StackifierData.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/scopes/Scope.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/variables/ResolvedVar.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/variables/VariableAllocation.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hightiercodegen/variables/VariableMap.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/BootstrapWatchDog.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CommunityCompilerConfigurationFactory.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CompilationContext.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CompilationCounters.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CompilationStatistics.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CompilationTask.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/CompilerConfigurationFactory.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/DefaultInstrumentation.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/EconomyCompilerConfigurationFactory.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/EncodedSnippets.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/GraalHotSpotVMConfig.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/GraalHotSpotVMConfigAccess.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotBackend.java (65%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotBackendFactory.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotBytecodeParser.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotCodeCacheListener.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotCompilationIdentifier.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotCompiledCodeBuilder.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotCounterOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotDataBuilder.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotDebugInfoBuilder.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotForeignCallLinkage.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotForeignCallLinkageImpl.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalCompiler.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalCompilerFactory.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalJVMCIServiceLocator.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalOptionValues.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalRuntime.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalRuntimeProvider.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalServices.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraalVMEventListener.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraphBuilderInstance.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotGraphBuilderPhase.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotHostBackend.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotLIRGenerationResult.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotLIRGenerator.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotLockStack.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotMarkId.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotNodeLIRBuilder.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotReferenceMapBuilder.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotReplacementsImpl.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotSnippetMetaAccessProvider.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotTTYStreamProvider.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/HotSpotZBarrierSet.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/IsGraalPredicate.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/IsGraalPredicateBase.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/JFRCompilerProfiler.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/JVMCICompilerShadow.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/JVMCIVersionCheck.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/JVMCIVersionCompare.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/ProfileReplaySupport.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/SnippetObjectConstant.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/SnippetResolvedJavaMethod.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/SnippetResolvedJavaType.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/SnippetSignature.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/SymbolicSnippetEncoder.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotBackend.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotBackendFactory.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotCounterOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotEpilogueOp.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java (73%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotLIRGenerator.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotLoweringProvider.java (73%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotMacroAssembler.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotMove.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotMoveFactory.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotReturnOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotSafepointOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotSuitesCreator.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotUnwindOp.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/aarch64/AArch64IndirectCallOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64DeoptimizeOp.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotAddressLowering.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotBackend.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotBackendFactory.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotCounterOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java (50%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotFrameMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotIndirectCallOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotLIRGenerator.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotLIRKindTool.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotLoweringProvider.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotMacroAssembler.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotMove.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotMoveFactory.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotReturnOp.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotSafepointOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotSuitesCreator.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotUnwindOp.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotZBarrieredOp.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64MathStub.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64TailcallOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64X87MathIntrinsicNode.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/amd64/AMD64X87MathSnippets.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/debug/BenchmarkCounters.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/lir/HotSpotZapRegistersPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/lir/VerifyMaxRegisterSizePhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/DefaultHotSpotLoweringProvider.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotConstantFieldProvider.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotDisassemblerProvider.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotExceptionDispatchPlugin.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotForeignCallDescriptor.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotForeignCallsProvider.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotForeignCallsProviderImpl.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotFuzzedSuitesProvider.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotGraalConstantFieldProvider.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotGraphBuilderPlugins.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotHostForeignCallsProvider.java (63%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotInvocationPluginProvider.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotInvocationPlugins.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotJITClassInitializationPlugin.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotLoadedSuitesProvider.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotLoweringProvider.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotMetaAccessExtensionProvider.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotNodePlugin.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotPlatformConfigurationProvider.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotProviders.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotRegisters.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotRegistersProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotSnippetReflectionProvider.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotStampProvider.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotSuitesProvider.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/HotSpotWordOperationPlugin.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/meta/UnimplementedGraalIntrinsics.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/AcquiredCASLockNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/AllocaNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/BeginLockScopeNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/CurrentJavaThreadNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/CurrentLockNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/DeoptimizeCallerNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/DeoptimizingStubCall.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/EndLockScopeNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/FastAcquireBiasedLockNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/HotSpotCompressionNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/HotSpotDirectCallTargetNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/HotSpotIndirectCallTargetNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/HotSpotLoadReservedReferenceNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/HotSpotStoreReservedReferenceNode.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/JumpToExceptionHandlerNode.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/KlassBeingInitializedCheckNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/LoadIndexedPointerNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/MonitorCounterNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/PatchReturnAddressNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/StubForeignCallNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/StubStartNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/VMErrorNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/VirtualThreadUpdateJFRNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/type/HotSpotNarrowOopStamp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/type/KlassPointerStamp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/type/MetaspacePointerStamp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/type/MethodCountersPointerStamp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/nodes/type/MethodPointerStamp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/package-info.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/phases/OnStackReplacementPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/AssertionSnippets.java (69%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/CallSiteTargetNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/ClassGetHubNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/DigestBaseSnippets.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/FastNotifyNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotAllocationSnippets.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotHashCodeSnippets.java (71%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotIdentityHashCodeNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotInvocationPluginHelper.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotIsArraySnippets.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotReplacementsUtil.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HotspotSnippetsOptions.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/HubGetClassNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/InstanceOfSnippets.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/KlassLayoutHelperNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/LoadExceptionObjectSnippets.java (68%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/Log.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/LogSnippets.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/MonitorSnippets.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/ObjectCloneNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/ObjectCloneSnippets.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/ObjectSnippets.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/RegisterFinalizerSnippets.java (60%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/StringToBytesSnippets.java (71%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/TypeCheckSnippetUtils.java (67%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/UnsafeCopyMemoryNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/UnsafeSnippets.java (73%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java (73%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/riscv64/RISCV64HotSpotBackendFactory.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java (71%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/AbstractForeignCallStub.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/ArrayStoreExceptionStub.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/ClassCastExceptionStub.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/CreateExceptionStub.java (71%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/DivisionByZeroExceptionStub.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/ExceptionHandlerStub.java (61%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/ForeignCallSnippets.java (66%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/ForeignCallStub.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/HotSpotGraphKit.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/IntegerExactOverflowExceptionStub.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/IntrinsicStubs.java (56%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/InvokeJavaMethodStub.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/LongExactOverflowExceptionStub.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/NegativeArraySizeExceptionStub.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/NullPointerExceptionStub.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/OutOfBoundsExceptionStub.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/SnippetStub.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/Stub.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/StubCompilationIdentifier.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/StubOptions.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/StubUtil.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/UnwindExceptionToCallerStub.java (60%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/stubs/VerifyOopStub.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/HotSpotOperation.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/HotSpotWordTypes.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/KlassPointer.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/MetaspacePointer.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/MethodCountersPointer.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/MethodPointer.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/word/PointerCastNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/BciBlockMapping.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/BytecodeParser.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/BytecodeParserOptions.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/DefaultSuitesCreator.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/FrameStateBuilder.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/GraphBuilderPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/JsrNotSupportedBailout.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/JsrScope.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/LambdaUtils.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/LargeLocalLiveness.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/LocalLiveness.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/SmallLocalLiveness.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/StableMethodNameFormatter.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/java/SuitesProviderBase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/BailoutAndRestartBackendException.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/CastValue.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/CompositeValue.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/CompositeValueClass.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ComputeCodeEmissionOrder.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ConstantValue.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ControlFlowOptimizer.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/EdgeMoveOptimizer.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/FullInfopointOp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/GenerateStub.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/GenerateStubs.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/GeneratedStubsHolder.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ImplicitLIRFrameState.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/InstructionStateProcedure.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/InstructionValueConsumer.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/InstructionValueProcedure.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIR.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRFrameState.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRInsertionBuffer.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRInstruction.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRInstructionClass.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRInstructionVerifier.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRIntrospection.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LIRValueUtil.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/LabelRef.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/NullCheckOptimizer.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/Opcode.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/RedundantMoveElimination.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/StandardOp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/StateProcedure.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/SwitchStrategy.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/SyncPort.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/SyncPorts.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ValueConsumer.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ValueProcedure.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/Variable.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/VirtualStackSlot.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64AESDecryptOp.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64AESEncryptOp.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64AcrossVectorOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64AddressValue.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ArithmeticOp.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ArrayCompareToOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ArrayEqualsOp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ArrayIndexOfOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ArrayRegionCompareToOp.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64AtomicMove.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BigIntegerMulAddOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BigIntegerSquareToLenOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BitFieldOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BitManipulationOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BitSwapOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BlockEndOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64BreakpointOp.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ByteSwap.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CacheWritebackOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CacheWritebackPostSyncOp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CalcStringAttributesOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64Call.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64Compare.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ComplexVectorOp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ControlFlow.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64Convert.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CountPositivesOp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64CounterModeAESCryptOp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64EncodeArrayOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64FloatToHalfFloatOp.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64FrameMap.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64FrameMapBuilder.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64GHASHProcessBlocksOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64HalfFloatToFloatOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64HaltOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64LIRFlags.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64LIRInstruction.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64MD5Op.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64MathCopySignOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64MathIntrinsicBinaryOp.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64MathSignumOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64Move.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64PauseOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64PermuteOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64PrefetchOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ReadTimestampCounter.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ReinterpretOp.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64RestoreRegistersOp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64RoundFloatToIntegerOp.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SHA1Op.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SHA256Op.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SHA3Op.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SHA512Op.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SaveRegistersOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SpeculativeBarrier.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64SpinWaitOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64StringLatin1InflateOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64StringUTF16CompressOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64VectorizedMismatchOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ZapRegistersOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ZapStackOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/aarch64/AArch64ZeroMemoryOp.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/AllocationStageVerifier.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/OutOfRegistersException.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/RegisterAllocationPhase.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/SaveCalleeSaveRegisters.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/Interval.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/IntervalWalker.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScan.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanAllocationPhase.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanAssignLocationsPhase.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanIntervalDumper.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanPhase.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/LinearScanWalker.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/MoveResolver.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/OptimizingLinearScanWalker.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/Range.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/RegisterVerifier.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/ssa/SSALinearScan.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/alloc/lsra/ssa/SSAMoveResolver.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64AESDecryptOp.java (67%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64AESEncryptOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64AddressValue.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64Arithmetic.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ArrayCompareToOp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ArrayCopyWithConversionsOp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ArrayEqualsOp.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ArrayIndexOfOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ArrayRegionCompareToOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BigIntegerMulAddOp.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BigIntegerSquareToLenOp.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64Binary.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BinaryConsumer.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BitSwapOp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BlockEndOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64BreakpointOp.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ByteSwapOp.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CacheWritebackOp.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CacheWritebackPostSyncOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CalcStringAttributesOp.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64Call.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ClearRegisterOp.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ComplexVectorOp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ControlFlow.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CountPositivesOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64CounterModeAESCryptOp.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64EncodeArrayOp.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64FloatToHalfFloatOp.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64FrameMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64FrameMapBuilder.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64GHASHProcessBlocksOp.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64HalfFloatToFloatOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64HaltOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64LFenceOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64LIRHelper.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64LIRInstruction.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MD5Op.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathCopySignOp.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathCosOp.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathExpOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathIntrinsicBinaryOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathIntrinsicUnaryOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathLog10Op.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathLogOp.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathPowOp.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathSignumOp.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathSinOp.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MathTanOp.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64Move.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64MulDivOp.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64NormalizedUnsignedCompareOp.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64PauseOp.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64PrefetchOp.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ReadProcid.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ReadTimestampCounterWithProcid.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64RestoreRegistersOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64RoundFloatToIntegerOp.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64SHA1Op.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64SHA256AVX2Op.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64SHA256Op.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64SHA512Op.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64SaveRegistersOp.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ShiftOp.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64SignExtendOp.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64StringLatin1InflateOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64StringUTF16CompressOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64Ternary.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64Unary.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64UnaryConsumer.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64VZeroUpper.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64VectorizedHashCodeOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64VectorizedMismatchOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ZapRegistersOp.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ZapStackOp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/AMD64ZeroMemoryOp.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/EndbranchOp.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/phases/StackMoveOptimizationPhase.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorBinary.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorBlend.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorClearOp.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorCompareOp.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorFloatCompareOp.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorGather.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorInstruction.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorMove.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorShuffle.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AMD64VectorUnary.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/amd64/vector/AVX512Support.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/asm/ArrayDataPointerConstant.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/asm/CompilationResultBuilder.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/asm/CompilationResultBuilderFactory.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/asm/DataBuilder.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/asm/EntryPointDecorator.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/asm/FrameContext.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/constopt/ConstantLoadOptimization.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/constopt/ConstantTree.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/constopt/ConstantTreeAnalyzer.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/constopt/DefUseTree.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/constopt/UseEntry.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/constopt/VariableMap.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/debug/IntervalDumper.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/debug/LIRGenerationDebugContext.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/dfa/LocationMarker.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/dfa/LocationMarkerPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/dfa/MarkBasePointersPhase.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/dfa/RegStackValueSet.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/dfa/UniqueWorkList.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/FrameMap.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/FrameMapBuilder.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/FrameMapBuilderImpl.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/FrameMapBuilderTool.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/ReferenceMapBuilder.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/SimpleVirtualStackSlot.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/SimpleVirtualStackSlotAlias.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/framemap/VirtualStackSlotRange.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/ArithmeticLIRGenerator.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/ArithmeticLIRGeneratorTool.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/BarrierSetLIRGenerator.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/BarrierSetLIRGeneratorTool.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/DiagnosticLIRGeneratorTool.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/LIRGenerationResult.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/LIRGenerator.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/LIRGeneratorTool.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/MoveFactory.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/gen/VerifyingMoveFactory.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/hashing/IntHasher.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/AllocationPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/AllocationStage.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/EconomyAllocationStage.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/EconomyFinalCodeAnalysisStage.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/EconomyPostAllocationOptimizationStage.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/EconomyPreAllocationOptimizationStage.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/FinalCodeAnalysisPhase.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/FinalCodeAnalysisStage.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/LIRPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/LIRPhaseSuite.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/LIRSuites.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/PostAllocationOptimizationPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/PostAllocationOptimizationStage.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/PreAllocationOptimizationPhase.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/phases/PreAllocationOptimizationStage.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/profiling/MethodProfilingPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/profiling/MoveProfiler.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/profiling/MoveProfilingPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/profiling/MoveType.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ssa/SSAUtil.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/ssa/SSAVerifier.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/stackslotalloc/FixPointIntervalBuilder.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/stackslotalloc/LSStackSlotAllocator.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/stackslotalloc/SimpleStackSlotAllocator.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/stackslotalloc/StackInterval.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/stackslotalloc/StackIntervalDumper.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/stackslotalloc/StackSlotAllocatorUtil.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/util/GenericValueMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/util/IndexedValueMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/util/RegisterMap.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/util/ValueMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/lir/util/ValueSet.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/ConvertDeoptimizeToGuardPhase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopFullUnrollPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopPartialUnrollPhase.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopPeelingPhase.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopPhase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopPredicationPhase.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopSafepointEliminationPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopTransformations.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/LoopUnswitchingPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/loop/phases/SpeculativeGuardMovementPhase.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/InputType.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/NodeCycles.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/NodeInfo.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/NodeSize.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/StructuralInput.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodeinfo/Verbosity.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractBeginNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractDeoptimizeNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractEndNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractFixedGuardNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractLocalNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractMergeNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/AbstractStateSplit.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ArithmeticOperation.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/BeginNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/BeginStateSplitNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/BinaryOpLogicNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/BreakpointNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/CallTargetNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/Cancellable.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/CanonicalizableLocation.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/CompanionObjectEncoder.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/CompressionNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ComputeObjectAddressNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ConditionAnchorNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ConstantNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ControlSinkNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ControlSplitNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DeadEndNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DeoptBciSupplier.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DeoptimizeNode.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DeoptimizingFixedWithNextNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DeoptimizingGuard.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DeoptimizingNode.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DirectCallTargetNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DynamicDeoptimizeNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/DynamicPiNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/EncodedGraph.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/EndNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/EntryMarkerNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/EntryProxyNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FieldLocationIdentity.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FixedGuardNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FixedNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FixedNodeInterface.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FixedWithNextNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FixedWithNextNodeInterface.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FloatingAnchoredNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FloatingGuardedNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FrameState.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/FullInfopointNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GetObjectAddressNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GraphDecoder.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GraphEncoder.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GraphState.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GuardNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GuardPhiNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GuardProxyNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/GuardedValueNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/IfNode.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ImplicitNullCheckNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/IndirectCallTargetNode.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/InliningLog.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/InliningLogCodec.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/Invokable.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/Invoke.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/InvokeNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/InvokeWithExceptionNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LIRLowerableLogicNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LogicConstantNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LogicNegationNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LogicNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LoopBeginNode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LoopEndNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LoopExitNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/LoweredCallTargetNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/MemoryMapControlSinkNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/MemoryProxyNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/MergeNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/NamedLocationIdentity.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/NodeView.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/OptimizationLog.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/OptimizationLogCodec.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/OptimizationLogImpl.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ParameterNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PauseNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PhiNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PiArrayNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PiNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PluginReplacementInterface.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PluginReplacementNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PluginReplacementWithExceptionNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/PrefetchAllocateNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ProfileData.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ProxyNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ReturnNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/SafepointNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ShortCircuitOrNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/SimplifyingGraphDecoder.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/SnippetAnchorNode.java (73%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/SpinWaitNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/StartNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/StateSplit.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/StaticDeoptimizingNode.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/StructuredGraph.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/TypeCheckHints.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/UnaryOpLogicNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/UnreachableBeginNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/UnreachableControlSinkNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/UnreachableNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/UnwindNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ValueNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ValueNodeInterface.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ValuePhiNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/ValueProxyNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/VirtualState.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/WithExceptionNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/AbsNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/AbstractNormalizeCompareNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/AddNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/AndNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/BinaryArithmeticNode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/BinaryNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/CompareNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/CompressBitsNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ConditionalNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ConvertNode.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/CopySignNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ExpandBitsNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FixedBinaryNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatConvertNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatDivNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatEqualsNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatLessThanNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatNormalizeCompareNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatTypeTestNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatingIntegerDivRemNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/FloatingNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerBelowNode.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerConvertNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerDivRemNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerEqualsNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerLessThanNode.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerLowerThanNode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerMulHighNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerNormalizeCompareNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IntegerTestNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/IsNullNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/LeftShiftNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/MaxNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/MinMaxNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/MinNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/MulNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/NarrowNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/NarrowableArithmeticNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/NegateNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/NotNode.java (72%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ObjectEqualsNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/OrNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/PointerEqualsNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ReinterpretNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/RemNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/RightShiftNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/RoundFloatToIntegerNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/RoundNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ShiftNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SignExtendNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SignedDivNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SignedFloatingIntegerDivNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SignedFloatingIntegerRemNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SignedRemNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SignumNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SqrtNode.java (69%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/SubNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/TernaryNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnaryArithmeticNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnaryNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnpackEndianHalfNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnsignedDivNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnsignedMaxNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnsignedMinNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnsignedRemNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/UnsignedRightShiftNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/XorNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/calc/ZeroExtendNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/cfg/ControlFlowGraph.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/cfg/HIRBlock.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/cfg/HIRLoop.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/cfg/LocationSet.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/cfg/ReversePostOrder.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/BindToRegisterNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/BlackholeNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/ControlFlowAnchorNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/ControlFlowAnchored.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/DynamicCounterNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/NeverStripMineNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/NeverWriteSinkNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/SideEffectNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/SpillRegistersNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/StringToBytesNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/debug/VerifyHeapNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/AbstractBoxingNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/AnchoringNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/ArrayRangeWrite.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/BoxNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/BranchProbabilityNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/BytecodeExceptionNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/CacheWritebackNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/CacheWritebackSyncNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/CaptureStateBeginNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/ClassIsArrayNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/FixedValueAnchorNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/ForeignCall.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/ForeignCallNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/GetClassNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/GuardedNode.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/GuardedUnsafeLoadNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/GuardingNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/HubGetClassNodeInterface.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/IntegerSwitchNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/JavaReadNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/JavaWriteNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/LoadArrayComponentHubNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/LoadHubNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/LoadHubOrNullNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/LoadMethodNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/MembarNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/MonitorEnter.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/MonitorExit.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/MultiGuardNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/NullCheckNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OSRLocalNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OSRLockNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OSRMonitorEnterNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OSRStartNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/ObjectIsArrayNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OpaqueGuardNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OpaqueLogicNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OpaqueNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/OpaqueValueNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/RawLoadNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/RawStoreNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/StateSplitProxyNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/StoreHubNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/SwitchCaseProbabilityNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/SwitchNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/UnboxNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/UnsafeAccessNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/UnsafeCopyNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/UnsafeMemoryLoadNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/UnsafeMemoryStoreNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/extended/ValueAnchorNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/ArrayRangeWriteBarrier.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/BarrierSet.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/CardTableBarrierSet.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/G1ArrayRangePostWriteBarrier.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/G1ArrayRangePreWriteBarrier.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/G1BarrierSet.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/G1PostWriteBarrier.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/G1PreWriteBarrier.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/G1ReferentFieldReadBarrier.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/ObjectWriteBarrier.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/SerialArrayRangeWriteBarrier.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/SerialWriteBarrier.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/WriteBarrier.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/gc/ZBarrierSet.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/ClassInitializationPlugin.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/ForeignCallPlugin.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GeneratedInvocationPlugin.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GeneratedPluginFactory.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GraphBuilderConfiguration.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GraphBuilderContext.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GraphBuilderPlugin.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/GraphBuilderTool.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/InlineInvokePlugin.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/IntrinsicContext.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/InvocationPlugin.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/InvocationPluginContext.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/InvocationPlugins.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/LoopExplosionPlugin.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/NodePlugin.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/ParameterPlugin.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/graphbuilderconf/TypePlugin.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AbstractCompareAndSwapNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AbstractNewArrayNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AbstractNewObjectNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AbstractUnsafeCompareAndSwapNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AccessArrayNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AccessFieldNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AccessIndexedNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AccessMonitorNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ArrayLengthNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AtomicReadAndAddNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/AtomicReadAndWriteNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ClassIsAssignableFromNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/DynamicNewArrayNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/DynamicNewInstanceNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ExceptionObjectNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/FinalFieldBarrierNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ForeignCallDescriptors.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/InstanceOfDynamicNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/InstanceOfNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LoadExceptionObjectNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LoadFieldNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LoadIndexedNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LogicCompareAndSwapNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LoweredAtomicReadAndAddNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LoweredAtomicReadAndWriteNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/LoweredRegisterFinalizerNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/MethodCallTargetNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/MonitorEnterNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/MonitorExitNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/MonitorIdNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/NewArrayInterface.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/NewArrayNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/NewInstanceNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/NewMultiArrayNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ReachabilityFenceNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/RegisterFinalizerNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/StoreFieldNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/StoreIndexedNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/TypeSwitchNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/UnsafeCompareAndExchangeNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/UnsafeCompareAndSwapNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ValidateNewInstanceClassNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/java/ValueCompareAndSwapNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/BasicInductionVariable.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/CountedLoopInfo.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/DefaultLoopPolicies.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/DerivedConvertedInductionVariable.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/DerivedInductionVariable.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/DerivedOffsetInductionVariable.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/DerivedScaledInductionVariable.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/InductionVariable.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/InductionVariableHelper.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopEx.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopExpandableNode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopFragment.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopFragmentInside.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopFragmentInsideBefore.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopFragmentInsideFrom.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopFragmentWhole.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopPolicies.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopsData.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/LoopsDataProviderImpl.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/loop/MathUtil.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/AbstractMemoryCheckpoint.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/AbstractWriteNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/AddressableMemoryAccess.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/ExtendableMemoryAccess.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/FixedAccessNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/FloatableAccessNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/FloatableThreadLocalAccess.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/FloatingAccessNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/FloatingReadNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/GuardedMemoryAccess.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/LIRLowerableAccess.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MemoryAccess.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MemoryAnchorNode.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MemoryKill.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MemoryMap.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MemoryMapNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MemoryPhiNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/MultiMemoryKill.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/OnHeapMemoryAccess.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/OrderedMemoryAccess.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/ReadNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/SideEffectFreeWriteNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/SingleMemoryKill.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/WriteNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/address/AddressNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/address/IndexAddressNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/memory/address/OffsetAddressNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/ArithmeticLIRLowerable.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/ArrayLengthProvider.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/Canonicalizable.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/CanonicalizerTool.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/CoreProviders.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/CoreProvidersDelegate.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/DelegatingReplacements.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/LIRLowerable.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/LimitedValueProxy.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/LoopsDataProvider.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/Lowerable.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/LoweringProvider.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/LoweringTool.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/MemoryEdgeProxy.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/NodeLIRBuilderTool.java (67%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/NodeValueMap.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/NodeWithState.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/PlatformConfigurationProvider.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/ProfileProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/Proxy.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/Replacements.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/ResolvedJavaMethodProfileProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/Simplifiable.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/SimplifierTool.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/SnippetParameterInfo.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/StableProfileProvider.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/StampInverter.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/StampProvider.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/SwitchFoldable.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/UncheckedInterfaceProvider.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/ValueProxy.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/Virtualizable.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/VirtualizableAllocation.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/VirtualizerTool.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/spi/WordVerification.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/type/NarrowOopStamp.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/type/StampTool.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/ConstantFoldUtil.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/ConstantReflectionUtil.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/GraphUtil.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/IntegerHelper.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/JavaConstantFormattable.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/JavaConstantFormatter.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/SignedIntegerHelper.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/util/UnsignedIntegerHelper.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/AllocatedObjectNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/CommitAllocationNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/EnsureVirtualizedNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/EscapeObjectState.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/LockState.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/MaterializedObjectState.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/VirtualArrayNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/VirtualBoxingNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/VirtualInstanceNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/VirtualObjectNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/nodes/virtual/VirtualObjectState.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/EnumMultiOptionKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/EnumOptionKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/ExcludeFromJacocoGeneratedReport.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/ExcludeFromJacocoInstrumentation.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/ModifiableOptionValues.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/NestedBooleanOptionKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OWNERS.toml (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/Option.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionDescriptor.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionDescriptors.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionDescriptorsMap.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionGroup.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionKey.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionStability.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionType.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionValues.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/options/OptionsParser.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/BasePhase.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/ClassTypeSequence.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/FloatingGuardPhase.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/LazyName.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/OptimisticOptimizations.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/Phase.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/PhaseSuite.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/PlaceholderPhase.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/SingleRunSubphase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/Speculative.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/VerifyPhase.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/AbstractInliningPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/AddressLoweringByNodePhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/AddressLoweringByUsePhase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/AddressLoweringPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/BarrierSetVerificationPhase.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/BoxNodeIdentityPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/BoxNodeOptimizationPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/CanonicalizerPhase.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/ConditionalEliminationPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/ConditionalEliminationUtil.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/DeadCodeEliminationPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/DeoptimizationGroupingPhase.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/DisableOverflownCountedLoopsPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/DominatorBasedGlobalValueNumberingPhase.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/ExpandLogicPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/FinalCanonicalizerPhase.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/FixReadsPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/FloatingReadPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/FrameStateAssignmentPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/GuardLoweringPhase.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/HighTierLoweringPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/IncrementalCanonicalizerPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/InsertGuardFencesPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/IterativeConditionalEliminationPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/LazyValue.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/LockEliminationPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/LoopSafepointInsertionPhase.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/LowTierLoweringPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/LoweringPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/MidTierLoweringPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/OptimizeDivPhase.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/OptimizeExtendsPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/PostRunCanonicalizationPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/ProfileCompiledMethodsPhase.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/PropagateDeoptimizeProbabilityPhase.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/RawConditionalEliminationPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/ReassociationPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/RemoveValueProxyPhase.java (70%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/SnippetFrameStateAssignment.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/UseTrappingNullChecksPhase.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/UseTrappingOperationPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/VerifyHeapAtReturnPhase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/WriteBarrierAdditionPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/InliningPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/InliningUtil.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/AbstractInlineInfo.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/AssumptionInlineInfo.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/ExactInlineInfo.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/InlineInfo.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/MultiTypeGuardInlineInfo.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/TypeGuardInlineInfo.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/elem/Inlineable.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/info/elem/InlineableGraph.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/policy/AbstractInliningPolicy.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/policy/GreedyInliningPolicy.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/policy/InlineEverythingPolicy.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/policy/InliningPolicy.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/walker/CallsiteHolder.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/walker/CallsiteHolderExplorable.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/walker/ComputeInliningRelevance.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/walker/InliningData.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/walker/InliningIterator.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/inlining/walker/MethodInvocation.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/util/EconomicSetNodeEventListener.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/util/LoopUtility.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/common/util/OptimizationUtility.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/contract/NodeCostUtil.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/contract/PhaseSizeContract.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/contract/VerifyNodeCosts.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/FixedNodeRelativeFrequencyCache.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/MergeableState.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/PostOrderNodeIterator.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/ReentrantBlockIterator.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/ReentrantNodeIterator.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/ScheduledNodeIterator.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/StatelessPostOrderNodeIterator.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/graph/package-info.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/package-info.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/schedule/BlockClosure.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/schedule/SchedulePhase.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/schedule/ScheduleVerification.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/CompilerConfiguration.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/HighTierContext.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/LowTierContext.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/MidTierContext.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/Suites.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/SuitesCreator.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/SuitesProvider.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/tiers/TargetProvider.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/util/GraphOrder.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/util/Providers.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/phases/util/ValueMergeUtil.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/BciBlockMappingDumpHandler.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/BinaryGraphPrinter.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/CFGPrinter.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/CFGPrinterObserver.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/CanonicalStringGraphPrinter.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/CompilationPrinter.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/GraalDebugHandlersFactory.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/GraphPrinter.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/GraphPrinterDumpHandler.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/printer/NoDeadCodeVerifyHandler.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/AllocationSnippets.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/BigIntegerSnippets.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/BoxingSnippets.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/CachingPEGraphDecoder.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/ConstantBindingParameterPlugin.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/DefaultJavaLoweringProvider.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/DimensionsNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/GraphKit.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/IdentityHashCodeSnippets.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/InlineDuringParsingPlugin.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/InstanceOfSnippetsTemplates.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/IntrinsicGraphBuilder.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/InvocationPluginHelper.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/IsArraySnippets.java (71%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/JavacBug.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/MethodHandlePlugin.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/MethodHandleWithExceptionPlugin.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/NodeIntrinsificationProvider.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/NodeStrideUtil.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/NonNullParameterPlugin.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/PEGraphDecoder.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/PartialIntrinsicCallTargetNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/ReplacementsImpl.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/ReplacementsUtil.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/SnippetCounter.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/SnippetCounterNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/SnippetIntegerHistogram.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/SnippetSubstitutionInvocationPlugin.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/SnippetSubstitutionNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/SnippetTemplate.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/Snippets.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/StandardGraphBuilderPlugins.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/StringHelperIntrinsics.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/StringLatin1InflateNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/StringLatin1Snippets.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/StringUTF16CompressNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/StringUTF16Snippets.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/TargetGraphBuilderPlugins.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/aarch64/AArch64BitCountNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/aarch64/AArch64GraphBuilderPlugins.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/aarch64/AArch64IntegerArithmeticSnippets.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/amd64/AMD64ConvertSnippets.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/amd64/AMD64FloatConvertNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/amd64/AMD64GraphBuilderPlugins.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/amd64/AMD64IntrinsicStubs.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/arraycopy/ArrayCopyCallNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/arraycopy/ArrayCopyForeignCalls.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/arraycopy/ArrayCopyLookup.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/arraycopy/ArrayCopyNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/arraycopy/ArrayCopySnippets.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/classfile/Classfile.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/classfile/ClassfileBytecode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/classfile/ClassfileBytecodeProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/classfile/ClassfileConstant.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/classfile/ClassfileConstantPool.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/classfile/ConstantPoolPatch.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/gc/G1WriteBarrierSnippets.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/gc/SerialWriteBarrierSnippets.java (67%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/gc/WriteBarrierSnippets.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/AESNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayCompareToForeignCalls.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayCompareToNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayCopyWithConversionsNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayEqualsForeignCalls.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayEqualsNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayIndexOfForeignCalls.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayIndexOfMacroNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayIndexOfNode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayRegionCompareToForeignCalls.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayRegionCompareToNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayRegionEqualsNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ArrayRegionEqualsWithMaskNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/AssertionNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BasicArrayCopyNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BasicObjectCloneNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BigIntegerMulAddNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BigIntegerMultiplyToLenNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BigIntegerSquareToLenNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BinaryMathIntrinsicNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BitCountNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BitScanForwardNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/BitScanReverseNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CStringConstant.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CalcStringAttributesForeignCalls.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CalcStringAttributesMacroNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CalcStringAttributesNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CipherBlockChainingAESNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CountLeadingZerosNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CountPositivesNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CountTrailingZerosNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/CounterModeAESNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/EncodeArrayNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ExplodeLoopNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/FallbackInvokeWithExceptionNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/FloatToHalfFloatNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ForeignCalls.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/FusedMultiplyAddNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/GHASHProcessBlocksNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/HalfFloatToFloatNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/IdentityHashCodeNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/IntrinsicMethodNodeInterface.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/LoadSnippetVarargParameterNode.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/LogNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MacroInvokable.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MacroNode.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MacroWithExceptionNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MemoryKillStubIntrinsicNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MessageDigestNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MethodHandleNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/MethodHandleWithExceptionNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ObjectClone.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ProfileBooleanNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/PureFunctionMacroNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/PureFunctionStubIntrinsicNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ReadRegisterNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ReflectionGetCallerClassNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ResolvedMethodHandleCallTargetNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ReverseBitsNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ReverseBytesNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/UnaryMathIntrinsicNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/VectorizedHashCodeNode.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/VectorizedMismatchNode.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/VirtualizableInvokeMacroNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/WriteRegisterNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/ZeroMemoryNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerAddExactNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerExactOverflowNode.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerMulExactNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerNegExactNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java (81%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerSubExactNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/replacements/nodes/arithmetic/UnsignedMulHighNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/runtime/RuntimeProvider.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/GlobalAtomicLong.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/GraalServices.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/GraalUnsafeAccess.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/IsolateUtil.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/JMXService.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/JavaVersionUtil.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/OWNERS.toml (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/ServiceProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/SpeculationEncodingAdapter.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/SpeculationReasonGroup.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/serviceprovider/UnencodedSpeculationReason.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/OWNERS.toml (100%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/AbstractKnownTruffleTypes.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/AbstractTruffleCompilationSupport.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/CommunityPartialEvaluatorConfiguration.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/EconomyPartialEvaluatorConfiguration.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/ExpansionStatistics.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/GraphTooBigBailoutException.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/KnownTruffleTypes.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/PEAgnosticInlineInvokePlugin.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/ParsingInlineInvokePlugin.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/PartialEvaluator.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/PartialEvaluatorConfiguration.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/PerformanceInformationHandler.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/PostPartialEvaluationSuite.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/SuppressFBWarnings.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleAST.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleCompilation.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleCompilationIdentifier.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleCompilerConfiguration.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleCompilerImpl.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleCompilerOptions.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleConstantFieldProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleDebugHandlersFactory.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleDebugJavaMethod.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleElementCache.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleInliningScope.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleStringConstantFieldProvider.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleTierConfiguration.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/TruffleTierContext.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/host/HostInliningPhase.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/host/TruffleHostEnvironment.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/host/TruffleKnownHostTypes.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotPartialEvaluator.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/TruffleEntryPointDecorator.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java (74%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/AnyExtendNode.java (75%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/IsCompilationConstantNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/ObjectLocationIdentity.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/TruffleAssumption.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/TruffleSafepointNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java (78%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/AllowMaterializeNode.java (77%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/ForceMaterializeNode.java (76%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/NewFrameNode.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameAccessType.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameClearNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameGetNode.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameIsNode.java (79%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameSetNode.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/FrameAccessVerificationPhase.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/InstrumentBranchesPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/InstrumentPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/InstrumentationSuite.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/MaterializeFramesPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/NeverPartOfCompilationPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/PhiTransformPhase.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/ReportPerformanceWarningsPhase.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/SetIdentityForValueTypesPhase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/TruffleCompilerPhases.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/TruffleSafepointInsertionPhase.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/TruffleTier.java (80%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java (83%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/AgnosticInliningPhase.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/CallNode.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/CallTree.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/DefaultInliningPolicy.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/GraphManager.java (86%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/InliningPolicy.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/InliningPolicyProvider.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/NoInliningPolicy.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java (88%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java (91%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/compiler/substitutions/TruffleInvocationPlugins.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/CollectionsUtil.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/OptionsEncoder.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/TypedDataInputStream.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/TypedDataOutputStream.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/json/JSONFormatter.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/json/JSONParser.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm => jdk/compiler/graal}/util/json/JSONParserException.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/EffectList.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/EffectsBlockState.java (95%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/EffectsClosure.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/EffectsPhase.java (82%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/FinalPartialEscapePhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/GraphEffectList.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/ObjectState.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/PEReadEliminationBlockState.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/PEReadEliminationClosure.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/PartialEscapeBlockState.java (94%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/PartialEscapeClosure.java (96%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/PartialEscapePhase.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/ReadEliminationBlockState.java (98%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/ReadEliminationClosure.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/ReadEliminationPhase.java (85%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/VirtualUtil.java (92%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/phases/ea/VirtualizerToolImpl.java (93%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/BarrieredAccess.java (90%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/ObjectAccess.java (99%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/Word.java (97%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/WordCastNode.java (87%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/WordOperationPlugin.java (84%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/WordTypes.java (89%) rename compiler/src/jdk.internal.vm.compiler/src/{org/graalvm/compiler => jdk/compiler/graal}/word/WordVerificationImpl.java (93%) rename compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/jdk21/test/PreviewEnabledTest.java (87%) rename compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/{org/graalvm/compiler => jdk/compiler/graal}/hotspot/jdk21/test/ScopedValueCacheTest.java (93%) rename compiler/src/org.graalvm.compiler.management/src/{org/graalvm/compiler => jdk/compiler/graal}/management/JMXServiceProvider.java (90%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/ConditionalEliminationBenchmark.java (94%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java (89%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/GraalBenchmark.java (94%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/GraphCopyBenchmark.java (89%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/NodeBenchmark.java (91%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/SchedulePhaseBenchmark.java (95%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/TestJMHWhitebox.java (93%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/FrameStateAssignmentState.java (87%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/GraalState.java (83%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/GraalUtil.java (90%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/GraphState.java (88%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/MethodSpec.java (97%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/NodesState.java (90%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/graal/util/ScheduleState.java (86%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/lir/CompileTimeBenchmark.java (91%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/lir/GraalCompilerState.java (87%) rename compiler/src/org.graalvm.compiler.microbenchmarks/src/{org/graalvm/compiler => jdk/compiler/graal}/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java (90%) rename compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/{org/graalvm/compiler => jdk/compiler/graal}/truffle/test/LoomUtils.java (97%) rename compiler/src/org.graalvm.compiler.virtual.bench/src/{org/graalvm/compiler => jdk/compiler/graal}/virtual/bench/PartialEscapeBench.java (95%) diff --git a/ci/common.jsonnet b/ci/common.jsonnet index b254e65709ed..c3989d791c29 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -259,9 +259,9 @@ local common_json = import "../common.json"; local common = mx + { catch_files+: [ - # Keep in sync with org.graalvm.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP + # Keep in sync with jdk.compiler.graal.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP "Graal diagnostic output saved in '(?P[^']+)'", - # Keep in sync with org.graalvm.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP + # Keep in sync with jdk.compiler.graal.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/compiler/docs/CompilationPlanFuzzing.md b/compiler/docs/CompilationPlanFuzzing.md index c44052933c39..61855ceaa0d9 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 `org.graalvm.compiler.core.phases.fuzzing`. +The following design can be found in the package `jdk.compiler.graal.core.phases.fuzzing`. ### Diagram ``` Suites > FuzzedSuites diff --git a/compiler/docs/Debugging.md b/compiler/docs/Debugging.md index c91cbd3c183c..2d71d7a1f6aa 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/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java). +[`DebugContext`](../src/jdk.compiler.graal.debug/src/jdk/compiler/graal/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/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java#L31-L82) +[DebugFilter](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java) and documented in the -[Dump help message](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt). As +[Dump help message](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java#L33-L92) +[MethodFilter](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java#L33-L92) and documented in the -[MethodFilter help message](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt). +[MethodFilter help message](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java)) to the + [Graph](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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[org.graalvm.compiler.graph.Node.updateUsages(Node, Node)].bgv -dumps/1497910458736/HotSpotCompilation-539[org.graalvm.compiler.graph.Node.updateUsages(Node, Node)].cfg +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 ``` 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 83a52efcebeb..faf37d0d6963 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 `org.graalvm.compiler` in their distribution jar. +or include projects starting with `jdk.compiler.graal` 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 01039022bce2..79c50598d277 100644 --- a/compiler/mx.compiler/mx_compiler.py +++ b/compiler/mx.compiler/mx_compiler.py @@ -157,7 +157,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.internal.vm.compiler', 'src', 'org', 'graalvm', 'compiler', 'hotspot', + source_path = join(_suite.dir, 'src', 'jdk.internal.vm.compiler', 'src', 'jdk', 'compiler', 'graal', 'hotspot', 'JVMCIVersionCheck.java') return mx.run([jdk.java, '-Xlog:disable', source_path] + (args or []), **kwargs) @@ -166,6 +166,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_excludes(['com.oracle.truffle']) mx_gate.add_jacoco_excluded_annotations(['@Snippet', '@ClassSubstitution', '@ExcludeFromJacocoInstrumentation']) @@ -228,7 +229,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', 'org.graalvm.compiler.hotspot.test.CompileTheWorld']) + args.extend(['-cp', cp, '-DCompileTheWorld.Help=true', 'jdk.compiler.graal.hotspot.test.CompileTheWorld']) run_java(args, out=out, addDefaultArgs=False) return out.data @@ -281,7 +282,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 = ['org.graalvm.compiler.hotspot.test.CompileTheWorld'] + mainClassAndArgs = ['jdk.compiler.graal.hotspot.test.CompileTheWorld'] run_vm(vmargs + mainClassAndArgs) @@ -1052,7 +1053,7 @@ def collate_metrics(args): if not filename.endswith('.csv'): mx.abort('Cannot collate metrics from non-CSV files: ' + filename) - # Keep in sync with org.graalvm.compiler.debug.GlobalMetrics.print(OptionValues) + # Keep in sync with jdk.compiler.graal.debug.GlobalMetrics.print(OptionValues) abs_filename = join(os.getcwd(), filename) directory = dirname(abs_filename) rootname = basename(filename)[0:-len('.csv')] @@ -1280,7 +1281,7 @@ def add_serviceprovider(service, provider, version): else: version = None provider = arcname[:-len('.class'):].replace('/', '.') - service = 'org.graalvm.compiler.options.OptionDescriptors' + service = 'jdk.compiler.graal.options.OptionDescriptors' add_serviceprovider(service, provider, version) return False @@ -1365,7 +1366,7 @@ def phaseplan_fuzz_jtt_tests(args, extraVMarguments=None, extraUnitTestArguments target_tests.append(arg) args.remove(arg) if not target_tests: - target_tests = ['org.graalvm.compiler.jtt.'] + target_tests = ['jdk.compiler.graal.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 149a941b6f5b..6dea7e16af30 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('org.graalvm.compiler') for dep in dist.archived_deps()) + (dep.name.startswith('jdk.compiler.graal') 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.internal.vm.compiler/org.graalvm.compiler.graph=ALL-UNNAMED', + '--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.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/mx_updategraalinopenjdk.py b/compiler/mx.compiler/mx_updategraalinopenjdk.py index de356c0c3efa..2d2197095531 100644 --- a/compiler/mx.compiler/mx_updategraalinopenjdk.py +++ b/compiler/mx.compiler/mx_updategraalinopenjdk.py @@ -116,8 +116,8 @@ def updategraalinopenjdk(args): SuiteJDKInfo('sdk', ['org.graalvm.collections', 'org.graalvm.word'], [])]), # JDK module jdk.internal.vm.compiler.management is composed of sources from: GraalJDKModule('jdk.internal.vm.compiler.management', - # 1. Classes in the compiler suite under the org.graalvm.compiler.hotspot.management namespace - [SuiteJDKInfo('compiler', ['org.graalvm.compiler.hotspot.management'], ['libgraal'])]), + # 1. Classes in the compiler suite under the jdk.compiler.graal.hotspot.management namespace + [SuiteJDKInfo('compiler', ['jdk.compiler.graal.hotspot.management'], ['libgraal'])]), ] else: if args.version < 15: @@ -134,8 +134,8 @@ def updategraalinopenjdk(args): SuiteJDKInfo('sdk', ['org.graalvm.collections', 'org.graalvm.word', 'org.graalvm.nativeimage', 'org.graalvm.options'], [])]), # JDK module jdk.internal.vm.compiler.management is composed of sources from: GraalJDKModule('jdk.internal.vm.compiler.management', - # 1. Classes in the compiler suite under the org.graalvm.compiler.hotspot.management namespace - [SuiteJDKInfo('compiler', ['org.graalvm.compiler.hotspot.management'], ['libgraal'])]), + # 1. Classes in the compiler suite under the jdk.compiler.graal.hotspot.management namespace + [SuiteJDKInfo('compiler', ['jdk.compiler.graal.hotspot.management'], ['libgraal'])]), ] @@ -183,10 +183,10 @@ def run_output(args, cwd=None): copied_source_dirs = [] jdk_internal_vm_compiler_EXCLUDES = set() # pylint: disable=invalid-name jdk_internal_vm_compiler_test_SRC = set() # pylint: disable=invalid-name - # Add org.graalvm.compiler.processor since it is only a dependency + # Add jdk.compiler.graal.processor since it is only a dependency # for (most) Graal annotation processors and is not needed to # run Graal. - jdk_internal_vm_compiler_EXCLUDES.add('org.graalvm.compiler.processor') + jdk_internal_vm_compiler_EXCLUDES.add('jdk.compiler.graal.processor') for m in graal_modules: classes_dir = join(jdkrepo, 'src', m.name, 'share', 'classes') for info in m.suites: @@ -389,16 +389,16 @@ def do_nothing(line): # replace renamed service compiler_module_info = join(jdkrepo, 'src', 'jdk.internal.vm.compiler', 'share', 'classes', 'module-info.java') - old_line = ' uses org.graalvm.compiler.nodes.graphbuilderconf.NodeIntrinsicPluginFactory;\n' - new_line = ' uses org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory;\n' + old_line = ' uses jdk.compiler.graal.nodes.graphbuilderconf.NodeIntrinsicPluginFactory;\n' + new_line = ' uses jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory;\n' replace_line(compiler_module_info, old_line, new_line) # Update 'SRC' in the 'Compile graalunit tests' section of make/test/JtregGraalUnit.gmk # to include all test packages. JtregGraalUnit_gmk = join(jdkrepo, 'make', 'test', 'JtregGraalUnit.gmk') # pylint: disable=invalid-name new_lines = [] - jdk_internal_vm_compiler_test_SRC.discard('org.graalvm.compiler.microbenchmarks') - jdk_internal_vm_compiler_test_SRC.discard('org.graalvm.compiler.virtual.bench') + jdk_internal_vm_compiler_test_SRC.discard('jdk.compiler.graal.microbenchmarks') + jdk_internal_vm_compiler_test_SRC.discard('jdk.compiler.graal.virtual.bench') jdk_internal_vm_compiler_test_SRC.discard('org.graalvm.micro.benchmarks') for pkg in sorted(jdk_internal_vm_compiler_test_SRC): new_lines.append('$(SRC_DIR)/' + pkg + '/src \\\n') @@ -415,7 +415,7 @@ def do_nothing(line): # Update 'PROCESSOR_JARS' and 'PROC_SRC_SUBDIRS' in make/modules/jdk.internal.vm.compiler/Gensrc.gmk Gensrc_gmk = join(jdkrepo, 'make', 'modules', 'jdk.internal.vm.compiler', 'Gensrc.gmk') # pylint: disable=invalid-name begin_lines = ['PROC_SRC_SUBDIRS := \\'] - end_line = 'org.graalvm.compiler.virtual \\' + end_line = 'jdk.compiler.graal.virtual \\' new_lines = [' jdk.internal.vm.compiler.libgraal.jni \\\n'] replace_lines(Gensrc_gmk, begin_lines, end_line, new_lines, old_line_check, preserve_indent=True, append_mode=True) @@ -431,7 +431,7 @@ def do_nothing(line): new_lines = ['\n $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_LIBGRAAL_JNI_PROCESSOR, \\\n', ' TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \\\n', ' SRC := \\\n', - ' $(SRC_DIR)/org.graalvm.compiler.processor/src \\\n', + ' $(SRC_DIR)/jdk.compiler.graal.processor/src \\\n', ' $(SRC_DIR)/jdk.internal.vm.compiler.libgraal.jni.annotation/src \\\n', ' $(SRC_DIR)/jdk.internal.vm.compiler.libgraal.jni.processor/src \\\n', ' , \\\n', diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py index 408814174044..d1b437bc5590 100644 --- a/compiler/mx.compiler/suite.py +++ b/compiler/mx.compiler/suite.py @@ -188,11 +188,11 @@ ], }, "uses" : [ - "org.graalvm.compiler.hotspot.meta.HotSpotInvocationPluginProvider", - "org.graalvm.compiler.lir.LIRInstructionVerifier", - "org.graalvm.compiler.core.common.CompilerProfiler", - "org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider", - "org.graalvm.compiler.truffle.compiler.phases.inlining.InliningPolicyProvider", + "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", ], "annotationProcessors" : [ "GRAAL_PROCESSOR" @@ -205,17 +205,17 @@ "jacocoExcludePackages" : [ "jdk.internal.vm.compiler.test", "org.graalvm.libgraal.jni", - "org.graalvm.compiler.replacements", - "org.graalvm.compiler.hotspot.test", - "org.graalvm.compiler.replacements.test", - "org.graalvm.compiler.api.directives.test", - "org.graalvm.compiler.test", - "org.graalvm.compiler.core.test", - "org.graalvm.compiler.nodes.test", - "org.graalvm.compiler.loop.test", - "org.graalvm.compiler.core.aarch64.test", - "org.graalvm.compiler.jtt", - "org.graalvm.compiler.truffle.test", + "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", ], }, @@ -294,6 +294,7 @@ "jdk.internal.vm.ci", "jdk.management", ], + "checkPackagePrefix": "false", "checkstyle" : "jdk.internal.vm.compiler", "annotationProcessors" : [ "GRAAL_PROCESSOR", @@ -484,29 +485,29 @@ com.oracle.svm.extraimage_enterprise, org.graalvm.truffle.runtime.svm, com.oracle.truffle.enterprise.svm""", - "org.graalvm.compiler.java to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure", - "org.graalvm.compiler.core.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.objectfile", - "org.graalvm.compiler.debug to org.graalvm.nativeimage.objectfile", - "org.graalvm.compiler.nodes.graphbuilderconf to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.librarysupport", - "org.graalvm.compiler.options to org.graalvm.nativeimage.driver,org.graalvm.nativeimage.junitsupport", - "org.graalvm.compiler.phases.common to org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure", - "org.graalvm.compiler.serviceprovider to jdk.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics", - "org.graalvm.util.json to org.graalvm.nativeimage.librarysupport,org.graalvm.nativeimage.agent.tracing,org.graalvm.nativeimage.configure,org.graalvm.nativeimage.driver", + "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.internal.vm.compiler.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", ], "uses" : [ - "org.graalvm.compiler.code.DisassemblerProvider", - "org.graalvm.compiler.core.match.MatchStatementSet", - "org.graalvm.compiler.debug.DebugHandlersFactory", - "org.graalvm.compiler.debug.TTYStreamProvider", - "org.graalvm.compiler.debug.PathUtilitiesProvider", - "org.graalvm.compiler.hotspot.HotSpotCodeCacheListener", - "org.graalvm.compiler.hotspot.HotSpotBackendFactory", - "org.graalvm.compiler.hotspot.meta.HotSpotInvocationPluginProvider", - "org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory", - "org.graalvm.compiler.options.OptionDescriptors", - "org.graalvm.compiler.serviceprovider.JMXService", - "org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory", - "org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider", + "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", ], }, "subDir" : "src", diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor b/compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor index b8ea34515a2f..66a49ff01c60 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor @@ -1,7 +1,7 @@ -org.graalvm.compiler.replacements.processor.ReplacementsAnnotationProcessor -org.graalvm.compiler.nodeinfo.processor.GraphNodeProcessor -org.graalvm.compiler.lir.processor.IntrinsicStubProcessor -org.graalvm.compiler.lir.processor.SyncPortProcessor -org.graalvm.compiler.core.match.processor.MatchProcessor -org.graalvm.compiler.options.processor.OptionProcessor -org.graalvm.compiler.serviceprovider.processor.ServiceProviderProcessor +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.internal.vm.compiler.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java index 06510a92a1d3..523842fb2e93 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/core/match/processor/MatchProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match.processor; +package jdk.compiler.graal.core.match.processor; import java.io.FileWriter; import java.io.IOException; @@ -57,7 +57,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** * Processes classes annotated with {@code MatchRule}. A {@code MatchStatementSet} service is @@ -71,16 +71,16 @@ * } * */ -@SupportedAnnotationTypes({"org.graalvm.compiler.core.match.MatchRule", "org.graalvm.compiler.core.match.MatchRules", "org.graalvm.compiler.core.match.MatchableNode", - "org.graalvm.compiler.core.match.MatchableNodes"}) +@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"}) public class MatchProcessor extends AbstractProcessor { - private static final String VALUE_NODE_CLASS_NAME = "org.graalvm.compiler.nodes.ValueNode"; - private static final String COMPLEX_MATCH_RESULT_CLASS_NAME = "org.graalvm.compiler.core.match.ComplexMatchResult"; - private static final String MATCHABLE_NODES_CLASS_NAME = "org.graalvm.compiler.core.match.MatchableNodes"; - private static final String MATCHABLE_NODE_CLASS_NAME = "org.graalvm.compiler.core.match.MatchableNode"; - private static final String MATCH_RULE_CLASS_NAME = "org.graalvm.compiler.core.match.MatchRule"; - private static final String MATCH_RULES_CLASS_NAME = "org.graalvm.compiler.core.match.MatchRules"; + 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"; 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 org.graalvm.compiler.core.match.*;"); - out.println("import org.graalvm.compiler.core.gen.NodeMatchRules;"); - out.println("import org.graalvm.compiler.graph.Position;"); + 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;"); 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, "org.graalvm.compiler.core.match.MatchStatementSet", originatingElements); + this.createProviderFile(pkg + "." + matchStatementClassName, "jdk.compiler.graal.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", "org.graalvm.compiler.nodes", Collections.emptyList(), false, false, false, false); + valueType = new TypeDescriptor(valueTypeMirror, "Value", "ValueNode", "jdk.compiler.graal.nodes", Collections.emptyList(), false, false, false, false); Map map = new HashMap<>(); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java index 7eb5d3381505..45cad9e6d50b 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/IntrinsicStubProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.processor; +package jdk.compiler.graal.lir.processor; import static javax.lang.model.type.TypeKind.VOID; @@ -48,11 +48,11 @@ import javax.tools.Diagnostic; import javax.tools.JavaFileObject; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** - * Processor for the {@code org.graalvm.compiler.lir.GenerateStub} and - * {@code org.graalvm.compiler.lir.GeneratedStubsHolder} annotation. + * Processor for the {@code jdk.compiler.graal.lir.GenerateStub} and + * {@code jdk.compiler.graal.lir.GeneratedStubsHolder} annotation. */ public class IntrinsicStubProcessor extends AbstractProcessor { @@ -61,11 +61,11 @@ enum TargetVM { substrate } - private static final String NODE_INTRINSIC_CLASS_NAME = "org.graalvm.compiler.graph.Node.NodeIntrinsic"; - private static final String GENERATE_STUB_CLASS_NAME = "org.graalvm.compiler.lir.GenerateStub"; - private static final String GENERATE_STUBS_CLASS_NAME = "org.graalvm.compiler.lir.GenerateStubs"; - private static final String GENERATED_STUBS_HOLDER_CLASS_NAME = "org.graalvm.compiler.lir.GeneratedStubsHolder"; - private static final String CONSTANT_NODE_PARAMETER_CLASS_NAME = "org.graalvm.compiler.graph.Node.ConstantNodeParameter"; + 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 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( - "org.graalvm.compiler.api.replacements.Snippet", - "org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage", - "org.graalvm.compiler.hotspot.meta.HotSpotProviders", - "org.graalvm.compiler.options.OptionValues", - "org.graalvm.compiler.hotspot.stubs.SnippetStub")); + "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")); 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", - "org.graalvm.compiler.api.replacements.Fold", - "org.graalvm.compiler.debug.GraalError", + "jdk.compiler.graal.api.replacements.Fold", + "jdk.compiler.graal.debug.GraalError", "org.graalvm.nativeimage.ImageSingletons", "java.util.EnumSet", "jdk.vm.ci.code.Architecture")); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/SyncPortProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/SyncPortProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java index 3f48f7d5fea8..a3212a7aee62 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/lir/processor/SyncPortProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.processor; +package jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** - * Processor for the {@code org.graalvm.compiler.lir.SyncPort} annotation. It verifies whether the + * Processor for the {@code jdk.compiler.graal.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 = "org.graalvm.compiler.lir.SyncPort"; - static final String SYNC_PORTS_CLASS_NAME = "org.graalvm.compiler.lir.SyncPorts"; + 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 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.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java index 52ab242d0075..334d581834f9 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/ElementException.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodeinfo.processor; +package jdk.compiler.graal.nodeinfo.processor; import javax.lang.model.element.Element; diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java index f24e5dd38244..eb3deaa5aa00 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodeinfo.processor; +package jdk.compiler.graal.nodeinfo.processor; import static java.util.Collections.reverse; @@ -46,15 +46,15 @@ import javax.lang.model.util.Types; import javax.tools.Diagnostic.Kind; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** * Processor for {@value #NODE_INFO_CLASS_NAME} annotation. */ @SupportedSourceVersion(SourceVersion.RELEASE_8) -@SupportedAnnotationTypes({"org.graalvm.compiler.nodeinfo.NodeInfo"}) +@SupportedAnnotationTypes({"jdk.compiler.graal.nodeinfo.NodeInfo"}) public class GraphNodeProcessor extends AbstractProcessor { - private static final String NODE_INFO_CLASS_NAME = "org.graalvm.compiler.nodeinfo.NodeInfo"; + private static final String NODE_INFO_CLASS_NAME = "jdk.compiler.graal.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("org.graalvm.compiler.graph.Node")) { + if (type.toString().equals("jdk.compiler.graal.graph.Node")) { return true; } type = (TypeElement) types.asElement(type.getSuperclass()); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java index 7456b9e882a9..988603a02aa2 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/nodeinfo/processor/GraphNodeVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodeinfo.processor; +package jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.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("org.graalvm.compiler.graph.Node.Input"); - this.OptionalInput = getTypeElement("org.graalvm.compiler.graph.Node.OptionalInput"); - this.Successor = getTypeElement("org.graalvm.compiler.graph.Node.Successor"); - this.Node = getTypeElement("org.graalvm.compiler.graph.Node"); - this.NodeInputList = getTypeElement("org.graalvm.compiler.graph.NodeInputList"); - this.NodeSuccessorList = getTypeElement("org.graalvm.compiler.graph.NodeSuccessorList"); + 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.object = getTypeElement("java.lang.Object"); } diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java index 50fc1b0ffd92..5a810a7e5d55 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/options/processor/OptionProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.options.processor; +package jdk.compiler.graal.options.processor; import java.io.BufferedReader; import java.io.IOException; @@ -56,7 +56,7 @@ import javax.tools.FileObject; import javax.tools.StandardLocation; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.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({"org.graalvm.compiler.options.Option"}) +@SupportedAnnotationTypes({"jdk.compiler.graal.options.Option"}) public class OptionProcessor extends AbstractProcessor { - private static final String OPTION_CLASS_NAME = "org.graalvm.compiler.options.Option"; - private static final String OPTION_KEY_CLASS_NAME = "org.graalvm.compiler.options.OptionKey"; - private static final String OPTION_TYPE_CLASS_NAME = "org.graalvm.compiler.options.OptionType"; - private static final String OPTION_STABILITY_CLASS_NAME = "org.graalvm.compiler.options.OptionStability"; - private static final String OPTION_TYPE_GROUP_NAME = "org.graalvm.compiler.options.OptionGroup"; - private static final String OPTION_DESCRIPTOR_CLASS_NAME = "org.graalvm.compiler.options.OptionDescriptor"; - private static final String OPTION_DESCRIPTORS_CLASS_NAME = "org.graalvm.compiler.options.OptionDescriptors"; + 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 final Set processed = new HashSet<>(); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java index 0b81a04135d9..50c7c2bc34bd 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/processor/AbstractProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.processor; +package jdk.compiler.graal.processor; import java.io.IOException; import java.io.OutputStreamWriter; diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java index bc51479f0bdc..0704d24421e1 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/processor/SuppressFBWarnings.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.processor; +package jdk.compiler.graal.processor; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/APHotSpotSignature.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/APHotSpotSignature.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java index ae73acda5d67..dc688639d8ef 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/APHotSpotSignature.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/AnnotationHandler.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/AnnotationHandler.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java index 77f2e63595e5..e5755b72d005 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/AnnotationHandler.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; import javax.lang.model.element.AnnotationMirror; import javax.lang.model.element.Element; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** * Handles processing of a single annotation type. diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/FoldHandler.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/FoldHandler.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java index 0e72002730db..12cf71d27e80 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/FoldHandler.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; -import static org.graalvm.compiler.processor.AbstractProcessor.getSimpleName; +import static jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** * Handler for the {@value #FOLD_CLASS_NAME} annotation. */ public final class FoldHandler extends AnnotationHandler { - static final String FOLD_CLASS_NAME = "org.graalvm.compiler.api.replacements.Fold"; - static final String INJECTED_PARAMETER_CLASS_NAME = "org.graalvm.compiler.api.replacements.Fold.InjectedParameter"; + 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"; public FoldHandler(AbstractProcessor processor) { super(processor, FOLD_CLASS_NAME); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java index 595574be3f41..efed0b2a9f67 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedFoldPlugin.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; -import static org.graalvm.compiler.replacements.processor.FoldHandler.FOLD_CLASS_NAME; -import static org.graalvm.compiler.replacements.processor.FoldHandler.INJECTED_PARAMETER_CLASS_NAME; +import static jdk.compiler.graal.replacements.processor.FoldHandler.FOLD_CLASS_NAME; +import static jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; -import org.graalvm.compiler.replacements.processor.InjectedDependencies.WellKnownDependency; +import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.compiler.graal.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("org.graalvm.compiler.nodes.ConstantNode"); - imports.add("org.graalvm.compiler.core.common.type.Stamp"); + imports.add("jdk.compiler.graal.nodes.ConstantNode"); + imports.add("jdk.compiler.graal.core.common.type.Stamp"); } @Override diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java index 8db5e2a1c9e4..92f5c9e01517 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedNodeIntrinsicPlugin.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java @@ -22,12 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; - -import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.CONSTANT_NODE_PARAMETER_CLASS_NAME; -import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.FOREIGN_CALL_DESCRIPTOR_CLASS_NAME; -import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.INJECTED_NODE_PARAMETER_CLASS_NAME; -import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.VALUE_NODE_CLASS_NAME; +package jdk.compiler.graal.replacements.processor; import java.io.PrintWriter; import java.util.List; @@ -40,7 +35,7 @@ import javax.lang.model.type.TypeKind; import javax.lang.model.type.TypeMirror; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** * Create graph builder plugins for {@code NodeIntrinsic} methods. @@ -66,9 +61,9 @@ protected String pluginSuperclass() { @Override public void extraImports(AbstractProcessor processor, Set imports) { - imports.add("org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext"); + imports.add("jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext"); if (needsReplacement(processor)) { - imports.add("org.graalvm.compiler.core.common.type.Stamp"); + imports.add("jdk.compiler.graal.core.common.type.Stamp"); } } @@ -83,7 +78,7 @@ protected void createExecute(AbstractProcessor processor, PrintWriter out, Injec int idx = 0; for (; idx < params.size(); idx++) { VariableElement param = params.get(idx); - if (processor.getAnnotation(param, processor.getType(INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) { + if (processor.getAnnotation(param, processor.getType(NodeIntrinsicHandler.INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) { break; } @@ -91,11 +86,11 @@ protected void createExecute(AbstractProcessor processor, PrintWriter out, Injec } for (int i = 0; i < signature.length; i++, idx++) { - if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) { + if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(NodeIntrinsicHandler.CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) { String argName = constantArgument(processor, out, deps, idx, signature[i], i, false); verifyConstantArgument(out, argName, signature[i]); } else { - if (signature[i].equals(processor.getType(VALUE_NODE_CLASS_NAME))) { + if (signature[i].equals(processor.getType(NodeIntrinsicHandler.VALUE_NODE_CLASS_NAME))) { out.printf(" ValueNode arg%d = args[%d];\n", idx, i); } else { out.printf(" %s arg%d = (%s) args[%d];\n", signature[i], idx, signature[i], i); @@ -170,7 +165,7 @@ protected List getParameters() { @Override public void extraImports(AbstractProcessor processor, Set imports) { if (needsReplacement(processor)) { - imports.add("org.graalvm.compiler.debug.GraalError"); + imports.add("jdk.compiler.graal.debug.GraalError"); } super.extraImports(processor, imports); } @@ -197,7 +192,7 @@ protected void factoryCall(AbstractProcessor processor, PrintWriter out, Injecte @Override protected void verifyConstantArgument(PrintWriter out, String argName, TypeMirror type) { - if (getErasedType(type).equals(FOREIGN_CALL_DESCRIPTOR_CLASS_NAME)) { + if (getErasedType(type).equals(NodeIntrinsicHandler.FOREIGN_CALL_DESCRIPTOR_CLASS_NAME)) { out.printf(" assert verifyForeignCallDescriptor(b, targetMethod, %s) : %s;\n", argName, argName); } } @@ -232,13 +227,13 @@ protected boolean needsReplacement(AbstractProcessor processor) { List params = getParameters(); for (; idx < params.size(); idx++) { VariableElement param = params.get(idx); - if (processor.getAnnotation(param, processor.getType(INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) { + if (processor.getAnnotation(param, processor.getType(NodeIntrinsicHandler.INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) { break; } } for (int i = 0; i < signature.length; i++, idx++) { - if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) { + if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(NodeIntrinsicHandler.CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) { return true; } } @@ -259,7 +254,7 @@ protected void createHelpers(AbstractProcessor processor, PrintWriter out, Injec int idx = 0; for (; idx < params.size(); idx++) { VariableElement param = params.get(idx); - if (processor.getAnnotation(param, processor.getType(INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) { + if (processor.getAnnotation(param, processor.getType(NodeIntrinsicHandler.INJECTED_NODE_PARAMETER_CLASS_NAME)) == null) { break; } @@ -267,10 +262,10 @@ protected void createHelpers(AbstractProcessor processor, PrintWriter out, Injec } for (int i = 0; i < signature.length; i++, idx++) { - if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) { + if (processor.getAnnotation(intrinsicMethod.getParameters().get(i), processor.getType(NodeIntrinsicHandler.CONSTANT_NODE_PARAMETER_CLASS_NAME)) != null) { constantArgument(processor, out, deps, idx, signature[i], i, true); } else { - if (signature[i].equals(processor.getType(VALUE_NODE_CLASS_NAME))) { + if (signature[i].equals(processor.getType(NodeIntrinsicHandler.VALUE_NODE_CLASS_NAME))) { out.printf(" ValueNode arg%d = args.get(%d);\n", idx, i); } else { out.printf(" %s arg%d = (%s) args.get(%d);\n", signature[i], idx, signature[i], i); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java index 6316be190f43..c13693866f9f 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/GeneratedPlugin.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; -import org.graalvm.compiler.replacements.processor.InjectedDependencies.WellKnownDependency; +import jdk.compiler.graal.processor.AbstractProcessor; +import jdk.compiler.graal.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("org.graalvm.compiler.nodes.WithExceptionNode"); + TypeMirror withExceptionNodeType = processor.getType("jdk.compiler.graal.nodes.WithExceptionNode"); return processor.env().getTypeUtils().isAssignable(nodeElement.asType(), withExceptionNodeType); } diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/InjectedDependencies.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/InjectedDependencies.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java index 654401fd167d..a9ab2fea3603 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/InjectedDependencies.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java @@ -22,10 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; -import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValue; -import static org.graalvm.compiler.replacements.processor.NodeIntrinsicHandler.NODE_INTRINSIC_CLASS_NAME; +import static jdk.compiler.graal.processor.AbstractProcessor.getAnnotationValue; import java.util.HashMap; import java.util.Iterator; @@ -35,7 +34,7 @@ import javax.lang.model.type.DeclaredType; import javax.lang.model.type.TypeMirror; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; public class InjectedDependencies implements Iterable { @@ -87,12 +86,12 @@ public String getExpression(AbstractProcessor processor, ExecutableElement injec private static final class InjectedStampDependency extends DependencyImpl { private InjectedStampDependency() { - super("stamp", "org.graalvm.compiler.core.common.type.Stamp"); + super("stamp", "jdk.compiler.graal.core.common.type.Stamp"); } @Override public String getExpression(AbstractProcessor processor, ExecutableElement inject) { - AnnotationMirror nodeIntrinsic = processor.getAnnotation(inject, processor.getType(NODE_INTRINSIC_CLASS_NAME)); + AnnotationMirror nodeIntrinsic = processor.getAnnotation(inject, processor.getType(NodeIntrinsicHandler.NODE_INTRINSIC_CLASS_NAME)); boolean nonNull = nodeIntrinsic != null && getAnnotationValue(nodeIntrinsic, "injectedStampIsNonNull", Boolean.class); return String.format("injection.getInjectedStamp(%s.class, %s)", GeneratedPlugin.getErasedType(inject.getReturnType()), nonNull); } @@ -102,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()", "org.graalvm.compiler.options.OptionValues"), + OPTIONVALUES("b.getOptions()", "jdk.compiler.graal.options.OptionValues"), INJECTED_STAMP(new InjectedStampDependency()), - SNIPPET_REFLECTION(new InjectedDependency("snippetReflection", "org.graalvm.compiler.api.replacements.SnippetReflectionProvider")), - STAMP_PROVIDER("b.getStampProvider()", "org.graalvm.compiler.nodes.spi.StampProvider"), - INTRINSIC_CONTEXT("b.getIntrinsic()", "org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext"), - STRUCTURED_GRAPH("b.getGraph()", "org.graalvm.compiler.nodes.StructuredGraph"); + 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"); private final String expr; private final String type; diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/NodeIntrinsicHandler.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/NodeIntrinsicHandler.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java index 25e4227eca34..90fb66abeaa8 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/NodeIntrinsicHandler.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; -import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValue; -import static org.graalvm.compiler.processor.AbstractProcessor.getAnnotationValueList; -import static org.graalvm.compiler.processor.AbstractProcessor.getSimpleName; +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 java.util.ArrayList; import java.util.Formatter; @@ -49,26 +49,26 @@ import javax.lang.model.util.ElementFilter; import javax.tools.Diagnostic.Kind; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.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 = "org.graalvm.compiler.graph.Node.ConstantNodeParameter"; - static final String MARKER_TYPE_CLASS_NAME = "org.graalvm.compiler.nodeinfo.StructuralInput.MarkerType"; - static final String GRAPH_BUILDER_CONTEXT_CLASS_NAME = "org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext"; - static final String STRUCTURAL_INPUT_CLASS_NAME = "org.graalvm.compiler.nodeinfo.StructuralInput"; + 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 RESOLVED_JAVA_TYPE_CLASS_NAME = "jdk.vm.ci.meta.ResolvedJavaType"; - static final String VALUE_NODE_CLASS_NAME = "org.graalvm.compiler.nodes.ValueNode"; - static final String STAMP_CLASS_NAME = "org.graalvm.compiler.core.common.type.Stamp"; - static final String NODE_CLASS_NAME = "org.graalvm.compiler.graph.Node"; - static final String NODE_INFO_CLASS_NAME = "org.graalvm.compiler.nodeinfo.NodeInfo"; - static final String NODE_INTRINSIC_CLASS_NAME = "org.graalvm.compiler.graph.Node.NodeIntrinsic"; - static final String NODE_INTRINSIC_FACTORY_CLASS_NAME = "org.graalvm.compiler.graph.Node.NodeIntrinsicFactory"; - static final String INJECTED_NODE_PARAMETER_CLASS_NAME = "org.graalvm.compiler.graph.Node.InjectedNodeParameter"; - static final String FOREIGN_CALL_DESCRIPTOR_CLASS_NAME = "org.graalvm.compiler.core.common.spi.ForeignCallDescriptor"; + 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"; public NodeIntrinsicHandler(AbstractProcessor processor) { super(processor, NODE_INTRINSIC_CLASS_NAME); diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java index ab7a94818bb8..6b923d769e44 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/PluginGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.replacements.processor; import java.io.IOException; import java.io.PrintWriter; @@ -44,7 +44,7 @@ import javax.tools.Diagnostic; import javax.tools.JavaFileObject; -import org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.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, "org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory", topLevelClass); + processor.createProviderFile(qualifiedGenClassName, "jdk.compiler.graal.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("org.graalvm.compiler.nodes.ValueNode"); - extra.add("org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext"); - extra.add("org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin"); - extra.add("org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins"); - extra.add("org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory"); - extra.add("org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider"); + 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"); for (GeneratedPlugin plugin : plugins) { plugin.extraImports(processor, extra); - extra.add("org.graalvm.compiler.nodes.graphbuilderconf." + plugin.pluginSuperclass()); + extra.add("jdk.compiler.graal.nodes.graphbuilderconf." + plugin.pluginSuperclass()); if (plugin.needsReplacement(processor)) { - extra.add("org.graalvm.compiler.options.ExcludeFromJacocoGeneratedReport"); - extra.add("org.graalvm.compiler.graph.NodeInputList"); + extra.add("jdk.compiler.graal.options.ExcludeFromJacocoGeneratedReport"); + extra.add("jdk.compiler.graal.graph.NodeInputList"); if (plugin.isWithExceptionReplacement(processor)) { - extra.add("org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode"); + extra.add("jdk.compiler.graal.nodes.PluginReplacementWithExceptionNode"); } else { - extra.add("org.graalvm.compiler.nodes.PluginReplacementNode"); + extra.add("jdk.compiler.graal.nodes.PluginReplacementNode"); } } } diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java index 897d5c052eb3..c4f6ce34c8f2 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/replacements/processor/ReplacementsAnnotationProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.processor; +package jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.processor.AbstractProcessor; /** - * Processor for annotation types in the {@code org.graalvm.compiler.replacements} name space. + * Processor for annotation types in the {@code jdk.compiler.graal.replacements} name space. */ public class ReplacementsAnnotationProcessor extends AbstractProcessor { diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java rename to compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java index a0b0d9aa12b0..b2efb46dd07d 100644 --- a/compiler/src/jdk.internal.vm.compiler.processor/src/org/graalvm/compiler/serviceprovider/processor/ServiceProviderProcessor.java +++ b/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.serviceprovider.processor; +package jdk.compiler.graal.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 org.graalvm.compiler.processor.AbstractProcessor; +import jdk.compiler.graal.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("org.graalvm.compiler.serviceprovider.ServiceProvider") +@SupportedAnnotationTypes("jdk.compiler.graal.serviceprovider.ServiceProvider") public class ServiceProviderProcessor extends AbstractProcessor { - private static final String SERVICE_PROVIDER_CLASS_NAME = "org.graalvm.compiler.serviceprovider.ServiceProvider"; + private static final String SERVICE_PROVIDER_CLASS_NAME = "jdk.compiler.graal.serviceprovider.ServiceProvider"; private final Set processed = new HashSet<>(); private final Map serviceProviders = new HashMap<>(); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java index 829eee50ade9..822a4fae228b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/BlackholeDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ConstantProbablityBranchFoldingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ConstantProbablityBranchFoldingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java index 82f34e613be7..103e4da2d95d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ConstantProbablityBranchFoldingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java @@ -23,13 +23,13 @@ * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java index 5baf6018084a..4a9c50471078 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ControlFlowAnchorDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java index f7c620ceb124..81b970c581c6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/DeoptimizeDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.phases.OptimisticOptimizations; public class DeoptimizeDirectiveTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/GraalDirectiveIntrinsificationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/GraalDirectiveIntrinsificationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java index c9bd795fc32b..81fd382e334a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/GraalDirectiveIntrinsificationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; import java.util.List; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java index 523c61629731..e78424b61edf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/IterationDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java index cc60fc1e4624..a0a4dd814331 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/OpaqueDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveShortCircuitTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveShortCircuitTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java index fc640a7ffcc5..0e411699dc92 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveShortCircuitTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; -import static org.graalvm.compiler.api.directives.GraalDirectives.sideEffect; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; +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 org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.ProfileData.ProfileSource; -import org.graalvm.compiler.nodes.ShortCircuitOrNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java index 79eb6ab8a5c1..a8155f436882 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/ProbabilityDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.vm.ci.meta.ResolvedJavaMethod; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java index 795ad3e8bed6..2e63d859ddb8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/directives/test/SwitchCaseProbabilityDirectiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java @@ -23,17 +23,17 @@ * questions. */ -package org.graalvm.compiler.api.directives.test; +package jdk.compiler.graal.api.directives.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.nodes.extended.SwitchCaseProbabilityNode; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/ExportingClassLoader.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/ExportingClassLoader.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java index e3eec111768d..d45c6c9f73b2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/ExportingClassLoader.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.test; +package jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/Graal.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/Graal.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/Graal.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/Graal.java index 5e94b1731703..807c3cc21440 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/Graal.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/Graal.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.test; +package jdk.compiler.graal.api.test; import java.util.Formatter; -import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; -import org.graalvm.compiler.api.runtime.GraalRuntime; +import jdk.compiler.graal.api.runtime.GraalJVMCICompiler; +import jdk.compiler.graal.api.runtime.GraalRuntime; import jdk.vm.ci.runtime.JVMCI; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/GraalAPITest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/GraalAPITest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/GraalAPITest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/GraalAPITest.java index c120e59f38fc..4fa1a11afc9e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/GraalAPITest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/GraalAPITest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.test; +package jdk.compiler.graal.api.test; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/ModuleSupport.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ModuleSupport.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/ModuleSupport.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ModuleSupport.java index 0dfe9a96818a..af2d0f65907b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/api/test/ModuleSupport.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ModuleSupport.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.test; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.DebugOptions; +import jdk.compiler.graal.debug.DebugOptions; import jdk.internal.module.Modules; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64AddressingModeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64AddressingModeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java index 0f08ef20f5a4..715819b8a485 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64AddressingModeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java @@ -23,17 +23,17 @@ * questions. */ -package org.graalvm.compiler.asm.aarch64.test; +package jdk.compiler.graal.asm.aarch64.test; import static org.junit.Assert.assertArrayEquals; import java.util.EnumSet; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64BitCountAssemblerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64BitCountAssemblerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java index 53d1a92a24cb..3ca4589793a0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64BitCountAssemblerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java @@ -23,14 +23,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64.test; +package jdk.compiler.graal.asm.aarch64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.test.AssemblerTest; -import org.graalvm.compiler.code.CompilationResult; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.asm.test.AssemblerTest; +import jdk.compiler.graal.code.CompilationResult; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64InstructionEncodingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64InstructionEncodingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java index 3c7eb7b997ae..9c49ec63d10d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64InstructionEncodingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java @@ -23,17 +23,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64.test; +package jdk.compiler.graal.asm.aarch64.test; import static org.junit.Assume.assumeTrue; import java.nio.ByteBuffer; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java index dafe714780b2..9ece67050b11 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java @@ -23,15 +23,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64.test; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.test.GraalTest; +import jdk.compiler.graal.asm.aarch64.AArch64Address; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.test.GraalTest; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MoveConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MoveConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java index 097c0d3f6f10..553af45a570d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/AArch64MoveConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java @@ -24,13 +24,13 @@ * questions. */ -package org.graalvm.compiler.asm.aarch64.test; +package jdk.compiler.graal.asm.aarch64.test; import static org.junit.Assert.assertArrayEquals; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.test.GraalTest; +import jdk.compiler.graal.asm.aarch64.AArch64Assembler; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.test.GraalTest; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java index 9f468ac39808..7443e53e9e42 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java @@ -23,12 +23,12 @@ * questions. */ -package org.graalvm.compiler.asm.aarch64.test; +package jdk.compiler.graal.asm.aarch64.test; -import org.graalvm.compiler.asm.AbstractAddress; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; +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.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/AMD64AssemblerUtilityTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/AMD64AssemblerUtilityTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java index 83d8c32aaf1d..67429fb712c8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/AMD64AssemblerUtilityTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java @@ -23,23 +23,23 @@ * questions. */ -package org.graalvm.compiler.asm.amd64.test; +package jdk.compiler.graal.asm.amd64.test; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.ZMM; +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 java.util.EnumSet; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Test; import jdk.vm.ci.amd64.AMD64; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java index 1ff0774d1963..c6ee6392a8b5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/BitOpsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java @@ -23,22 +23,22 @@ * questions. */ -package org.graalvm.compiler.asm.amd64.test; +package jdk.compiler.graal.asm.amd64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +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 org.junit.Assume.assumeTrue; import java.lang.reflect.Field; import java.util.EnumSet; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.test.AssemblerTest; -import org.graalvm.compiler.code.CompilationResult; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java index 0fa996c8711e..3e160558a3ff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/IncrementDecrementMacroTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64.test; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.test.AssemblerTest; -import org.graalvm.compiler.code.CompilationResult; +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; public class IncrementDecrementMacroTest extends AssemblerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/IndirectCallTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/IndirectCallTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java index c49834e5e3ae..d0809e7b8aae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/IndirectCallTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64.test; +package jdk.compiler.graal.asm.amd64.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.test.AssemblerTest; +import jdk.compiler.graal.asm.amd64.AMD64Assembler; +import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; +import jdk.compiler.graal.asm.test.AssemblerTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java index 94512cb470ed..92d3cf177cca 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/amd64/test/SimpleAssemblerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64.test; +package jdk.compiler.graal.asm.amd64.test; import static org.junit.Assume.assumeTrue; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.test.AssemblerTest; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.code.DataSection.Data; -import org.graalvm.compiler.code.DataSection.RawData; -import org.graalvm.compiler.code.DataSection.SerializableData; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java index dac1f0ffefa9..17ab59f5fa43 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/asm/test/AssemblerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.test; +package jdk.compiler.graal.asm.test; -import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest; +import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest; import java.lang.reflect.Method; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.DisassemblerProvider; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.gen.LIRGenerationProvider; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.gc.ZBarrierSet; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64AddSubShiftTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64AddSubShiftTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java index 8ef626887029..18b4e3481c04 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64AddSubShiftTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java index 3ba8b12fe809..c40a2182b778 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ArrayAddressTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java @@ -23,13 +23,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ExtendedAddSubShiftOp; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import java.util.ArrayDeque; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java index 18ed28f5b4bd..60408b41bbce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitFieldTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64BitFieldOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64BitFieldOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitwiseLogicalNotTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitwiseLogicalNotTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java index 0b877368ae05..18b173bc4f40 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64BitwiseLogicalNotTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java @@ -24,11 +24,11 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.BinaryOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.BinaryOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64CbzTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64CbzTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java index 2d059a8ec66b..dbbceab63660 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64CbzTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ConditionalSetTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ConditionalSetTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java index e42b29672b0e..00f3d43d77ae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ConditionalSetTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java @@ -24,11 +24,11 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.core.common.calc.UnsignedMath; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow; +import jdk.compiler.graal.core.common.calc.UnsignedMath; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ControlFlow; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ElideL2ITest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ElideL2ITest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java index 3a410043d4a0..06163814140a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64ElideL2ITest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64FloatSqrtTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64FloatSqrtTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java index 90ff9b3549cc..6ffaa2899e76 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64FloatSqrtTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java @@ -23,9 +23,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; +import jdk.compiler.graal.lir.LIRInstruction; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64LogicShiftTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64LogicShiftTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java index c9acda8dff7e..fa2121737e60 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64LogicShiftTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MNegTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MNegTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java index dafafa89257c..2add32d52098 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MNegTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; import java.util.function.Predicate; -import org.graalvm.compiler.lir.LIRInstruction; +import jdk.compiler.graal.lir.LIRInstruction; import org.junit.Test; public class AArch64MNegTest extends AArch64MatchRuleTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MatchRuleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MatchRuleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java index 4eb4ca81fc62..0e51254192f8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MatchRuleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; import jdk.vm.ci.aarch64.AArch64; -import org.graalvm.compiler.core.test.MatchRuleTest; +import jdk.compiler.graal.core.test.MatchRuleTest; import org.junit.Before; import static org.junit.Assume.assumeTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MembarOpTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MembarOpTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java index 8783ce43791e..2189aadae5d9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MembarOpTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Assembler.BarrierKind; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.gen.LIRGenerationProvider; -import org.graalvm.compiler.core.test.backend.BackendTest; -import org.graalvm.compiler.lir.aarch64.AArch64Move.MembarOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.nodes.StructuredGraph; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java index f7b31d7cf9fa..729220d0139c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java @@ -23,10 +23,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java index 98ecb46bc4dc..ccffa2bc26b5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java @@ -23,10 +23,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java index d50030acd435..764e9c4c5c3b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp.BinaryConstOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyAddSubTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyAddSubTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java index 8b4ad010d436..62d88e952465 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyAddSubTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java index 623a798d14c8..5c0eddf24f07 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64MultiplyLongTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java index 6917c7f868cd..62d3be1bcc4e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64NegateShiftTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java @@ -23,10 +23,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64ArithmeticOp; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64PairLoadStoreTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64PairLoadStoreTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java index fbb7baaccf69..5375524e03e4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64PairLoadStoreTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java @@ -24,11 +24,11 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.runtime.JVMCI; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64RotationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64RotationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java index e4b410d7209a..4f71b950784e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64RotationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java @@ -23,9 +23,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; -import org.graalvm.compiler.lir.LIRInstruction; +import jdk.compiler.graal.lir.LIRInstruction; import org.junit.Test; import java.util.function.Predicate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java index 1fe5889a04a3..3b5462bdb107 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64TestBitAndBranchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java @@ -22,27 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; +import jdk.compiler.graal.asm.Label; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; -import org.graalvm.compiler.lir.phases.LIRPhase; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -79,8 +80,7 @@ public void testBit42() { /** * Tests the graceful case, where the estimation for - * {@link CompilationResultBuilder#labelWithinLIRRange(LIRInstruction, org.graalvm.compiler.asm.Label, int)} - * holds. + * {@link CompilationResultBuilder#labelWithinLIRRange(LIRInstruction, Label, int)} holds. */ public static int testBitTestAndBranchSingleSnippet(int a) { int res; @@ -102,8 +102,8 @@ public void testBitTestAndBranchSingle() { /** * Tests the case, where the estimation for - * {@link CompilationResultBuilder#labelWithinLIRRange(LIRInstruction, org.graalvm.compiler.asm.Label, int)} - * does not hold and the code generation must be redone with large branches. + * {@link CompilationResultBuilder#labelWithinLIRRange(LIRInstruction, Label, int)} does not + * hold and the code generation must be redone with large branches. */ public static int testBitTestAndBranchFourSnippet(int a) { int res; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java index eb761a1bb8f0..e1dd53725d38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/aarch64/test/AArch64VolatileAccessesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java @@ -24,13 +24,13 @@ * questions. */ -package org.graalvm.compiler.core.aarch64.test; +package jdk.compiler.graal.core.aarch64.test; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; -import org.graalvm.compiler.core.test.MatchRuleTest; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64Move; +import jdk.compiler.graal.core.test.MatchRuleTest; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.aarch64.AArch64Move; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64AddressLoweringTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64AddressLoweringTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java index 60ea53a9bc2d..dbca929af62b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64AddressLoweringTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64.test; +package jdk.compiler.graal.core.amd64.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.amd64.AMD64AddressLowering; -import org.graalvm.compiler.core.amd64.AMD64AddressNode; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java index 98c04052ca2c..4819fd70bf35 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64AllocatorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64.test; +package jdk.compiler.graal.core.amd64.test; -import static org.graalvm.compiler.core.common.GraalOptions.RegisterPressure; +import static jdk.compiler.graal.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 org.graalvm.compiler.core.test.backend.AllocatorTest; +import jdk.compiler.graal.core.test.backend.AllocatorTest; public class AMD64AllocatorTest extends AllocatorTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64MatchRuleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64MatchRuleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java index 619a5e627d94..4e91c0c4a9de 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64MatchRuleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64.test; +package jdk.compiler.graal.core.amd64.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.test.MatchRuleTest; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.amd64.AMD64Binary; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.ConstOp; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.MemoryConstOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CmpBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CmpConstBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CmpDataBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64Unary; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java index 9be371e59419..d172fd456d34 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64.test; +package jdk.compiler.graal.core.amd64.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.memory.WriteNode; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java index 0aa684bffa7e..5de23e5dec7c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/ConstantStackMoveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64.test; +package jdk.compiler.graal.core.amd64.test; import static org.junit.Assume.assumeTrue; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java index 5bc3e80926f6..39aa85f8232a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/amd64/test/StackStoreTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64.test; +package jdk.compiler.graal.core.amd64.test; import static org.junit.Assume.assumeTrue; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/AbsCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/AbsCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java index f68a53416a2e..1773d4a64880 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/AbsCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AbsNode; -import org.graalvm.compiler.nodes.calc.NegateNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.calc.AbsNode; +import jdk.compiler.graal.nodes.calc.NegateNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/AllocSpy.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AllocSpy.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/AllocSpy.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AllocSpy.java index 2d1a610235a2..d92ec704dd2a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/AllocSpy.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AllocSpy.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static java.lang.Boolean.parseBoolean; import static java.lang.Integer.getInteger; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ArrayCopyVirtualizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ArrayCopyVirtualizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java index 40e3b6e97a09..6023ea550f01 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ArrayCopyVirtualizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java @@ -23,12 +23,12 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.NewArrayNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.java.NewArrayNode; public class ArrayCopyVirtualizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ArrayLengthProviderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ArrayLengthProviderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java index 0f6f4f666339..ff6f56184af8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ArrayLengthProviderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BasePhaseBinaryGraphTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BasePhaseBinaryGraphTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java index 4a2937923485..90a2b04d5a1a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BasePhaseBinaryGraphTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static org.junit.Assert.assertEquals; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.printer.BinaryGraphPrinter; +import jdk.compiler.graal.debug.DebugContext; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.printer.BinaryGraphPrinter; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BciBlockMappingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BciBlockMappingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java index 0b1ba51b81a1..cf49dc37c671 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BciBlockMappingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.java.BciBlockMapping; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.SafepointNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; +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 org.junit.Test; import java.util.Random; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java index f5859c48baa6..059dc49585b8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BoxingEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.loop.phases.LoopPeelingPhase; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BoxingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BoxingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingTest.java index cfb8edcf825d..eff1823aea0a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BoxingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java index 90a9986a0bf8..e3b6d22a294c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ByteBufferTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BytecodeDisassemblerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BytecodeDisassemblerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java index b391fdcc4e94..29e24396bc1d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/BytecodeDisassemblerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.IOException; import java.net.URI; @@ -35,7 +35,7 @@ import java.util.List; import java.util.Random; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; +import jdk.compiler.graal.bytecode.BytecodeDisassembler; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CanonicalizedConversionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CanonicalizedConversionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java index 51394e4c9b11..ca331e4678f8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CanonicalizedConversionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.FloatEqualsNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java index 8ecc9fa27bb8..b770fa1a8e6b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CheckGraalInvariants.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter; -import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.api.test.ModuleSupport; -import org.graalvm.compiler.bytecode.BridgeMethodUtils; -import org.graalvm.compiler.core.CompilerThreadFactory; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.memory.MemoryKill; -import org.graalvm.compiler.nodes.memory.MultiMemoryKill; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionDescriptor; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.VerifyPhase; -import org.graalvm.compiler.phases.VerifyPhase.VerificationError; -import org.graalvm.compiler.phases.contract.VerifyNodeCosts; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.test.AddExports; +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 org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Assume; @@ -203,14 +203,7 @@ protected void updateVerifiers(List> verifiers) { */ public boolean shouldCheckUsage(OptionDescriptor option) { Class declaringClass = option.getDeclaringClass(); - if (declaringClass.getName().equals("org.graalvm.compiler.truffle.compiler.SharedTruffleCompilerOptions")) { - /* - * These options are aliases for Truffle runtime options whose usages are not on the - * class path used when running CheckGraalInvariants. - */ - return false; - } - if (declaringClass.getName().equals("org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions")) { + if (declaringClass.getName().equals("jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions")) { /* * These options are deprecated and will be removed in GraalVM 20.2.0. The * TruffleIntrinsifyFrameAccess option has no replacement and is unused. @@ -220,7 +213,7 @@ public boolean shouldCheckUsage(OptionDescriptor option) { if (option.getOptionKey().getClass().isAnonymousClass()) { /* * Probably a derived option such as - * org.graalvm.compiler.debug.DebugOptions.PrintGraphFile. + * jdk.compiler.graal.debug.DebugOptions.PrintGraphFile. */ return false; } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java index 9e86eb4c36c6..fa138b2f3e3d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CommonedConstantsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.reflect.Array; @@ -30,7 +30,7 @@ import org.junit.Test; -import org.graalvm.compiler.phases.common.AbstractInliningPhase; +import jdk.compiler.graal.phases.common.AbstractInliningPhase; /** * Tests any optimization that commons loads of non-inlineable constants. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java index 508f41943390..cabe200e2b3d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IntegerTestNode; +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; import org.junit.Test; public class CompareCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java index 52da99770de3..01e33b3c670a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; public class CompareCanonicalizerTest2 extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java index 7771df8557ef..95540e478301 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompareCanonicalizerTest3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompilationResultTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompilationResultTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java index f43ec1705c13..1abe7469fa48 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompilationResultTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.CompilationResult.CodeComment; -import org.graalvm.compiler.code.CompilationResult.CodeMark; -import org.graalvm.compiler.code.CompilationResult.JumpTable; +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 org.junit.Test; public class CompilationResultTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompilationWatchDogTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompilationWatchDogTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java index ad7d6f2a0e1b..c3e2ce92161d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CompilationWatchDogTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.CompilationWatchDog.Options.CompilationWatchDogStartDelay; -import static org.graalvm.compiler.core.CompilationWatchDog.Options.CompilationWatchDogVMExitDelay; -import static org.graalvm.compiler.core.GraalCompilerOptions.InjectedCompilationDelay; +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 java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; -import org.graalvm.compiler.core.CompilationWatchDog; -import org.graalvm.compiler.core.CompilationWatchDog.EventHandler; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java index f192b187d6d0..e1652a64454a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConcreteSubtypeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionTest.java index 955929d89000..c8e200bfe85a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -30,9 +30,9 @@ import java.util.Random; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; +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 org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java index 420f3105b6dd..8b8369d53869 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationMulTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; public class ConditionalEliminationMulTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationPiTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationPiTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java index c5e181cbcf29..bc1749c239f2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationPiTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationRegressionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationRegressionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java index 519d81f3aae9..69cf7bc8f962 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationRegressionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java @@ -22,45 +22,45 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.common.type.StampFactory.objectNonNull; +import static jdk.compiler.graal.core.common.type.StampFactory.objectNonNull; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.GuardPhiNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.MergeNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy; -import org.graalvm.compiler.phases.util.GraphOrder; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationStampInversionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationStampInversionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java index bb5879b8aab2..f763c57e3145 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationStampInversionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AndNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.calc.IntegerTestNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +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 org.junit.Test; import jdk.vm.ci.code.InvalidInstalledCodeException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java index 68c1f05d4938..ce764fa770b2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java @@ -22,14 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest1 extends ConditionalEliminationTestBase { protected static int sink3; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java index 338363171a86..351d1b04d199 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest10.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java @@ -22,24 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.GuardNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; +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 org.junit.Assert; import org.junit.Test; /** - * This test checks the combined action of - * {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} and - * {@link org.graalvm.compiler.phases.common.LoweringPhase}. The lowering phase needs to introduce - * the null checks at the correct places for the dominator conditional elimination phase to pick - * them up. + * This test checks the combined action of {@link ConditionalEliminationPhase} and + * {@link LoweringPhase}. The lowering phase needs to introduce the null checks at the correct + * places for the dominator conditional elimination phase to pick them up. */ public class ConditionalEliminationTest10 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java index 9cdc057915d8..d5d0ef9c0bce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest11.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java @@ -22,15 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest11 extends ConditionalEliminationTestBase { @SuppressWarnings("all") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java index 6a3f75d268a4..1957e3dbc80a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest12.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import org.junit.Test; public class ConditionalEliminationTest12 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java index 56ed6f1b4200..6ae76a31a06e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest13.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; +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; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java index 6e45ca04fb4a..be17338d0f80 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest14.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.GuardNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.IntegerBelowNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java index bdbabcf14b6f..3fd718ab4211 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest15.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java @@ -22,24 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.IntegerLessThanNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; -import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase; +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 org.junit.Assert; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest15 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java index 16e87e360172..5824531f8118 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StructuredGraph; +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; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java index 63175864d3e7..a2a561513fe7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.GuardNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; +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; import org.junit.Assert; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest2 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java index bfefa7b0abde..d547d12d50f0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java @@ -22,14 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ @Ignore public class ConditionalEliminationTest3 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java index d5f7b617d288..e97b0663abff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java @@ -22,13 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest4 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java index 9f13a0c836ad..730d46306f57 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest5.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java @@ -22,15 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest5 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java index 19dc23d19a77..b7e42420315c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest6.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java @@ -22,13 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest6 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java index 754c46b7c841..941191961add 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest7.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java @@ -22,14 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Ignore; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ @Ignore public class ConditionalEliminationTest7 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java index bc8b97542963..415bcb94725e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest8.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java @@ -22,13 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Test; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest8 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java index 057979848626..c4ef20f22704 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTest9.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java @@ -22,15 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTest9 extends ConditionalEliminationTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java index 01924fecb8ad..40b1d9a58b0e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalEliminationTestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodes.ProxyNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; +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 org.junit.Assert; /** - * Collection of tests for {@link org.graalvm.compiler.phases.common.ConditionalEliminationPhase} - * including those that triggered bugs in this phase. + * Collection of tests for {@link ConditionalEliminationPhase} including those that triggered bugs + * in this phase. */ public class ConditionalEliminationTestBase extends GraalCompilerTest { protected static int sink0; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java index c7524748d761..baf9cff9cb6a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConditionalNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.nodes.CallTargetNode.InvokeKind; +import jdk.compiler.graal.phases.OptimisticOptimizations; import org.junit.Test; public class ConditionalNodeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java index 506896b7cb08..f89be21c6e2e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ConstantArrayReadFoldingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java index 2ae6ded2d38a..3e4645ec4b37 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CopyOfVirtualizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java @@ -23,14 +23,14 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Arrays; import org.junit.Test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.NewArrayNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.java.NewArrayNode; public class CopyOfVirtualizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java index 658c922f81e7..a654dcd4c0e1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopMaxTripCountPiTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopOverflowTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopOverflowTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java index d2c35aa33686..8b1a3f8a91d3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopOverflowTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Collections; import java.util.EnumMap; @@ -30,10 +30,10 @@ import java.util.Formatter; import java.util.Map; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Test; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java index f4f056b472ed..189d12981fd8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.loop.InductionVariable; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java index 27ffcd1f5b7d..feee8d3b2023 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CountedLoopTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.FilteredNodeIterable; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CustomizedBytecodePatternTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CustomizedBytecodePatternTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java index 8d51b3544bea..da3c7d625e17 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/CustomizedBytecodePatternTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.File; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java index 8cf3013d0576..8e485f9e6a13 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DeMorganCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.AndNode; -import org.graalvm.compiler.nodes.calc.NotNode; -import org.graalvm.compiler.nodes.calc.OrNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DeepUnrollingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DeepUnrollingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java index 9d0da6726d3a..7d297342aa4e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DeepUnrollingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.IOException; import java.util.concurrent.TimeUnit; import java.util.stream.LongStream; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.common.GraalOptions; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java index 81c5ba73ed17..3de4b886abc9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DegeneratedLoopsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java index 51f37defaeaa..32e9130b1aa7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DirectByteBufferTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.nio.ByteBuffer; import java.nio.ByteOrder; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java index f22fbd5036a0..06a679d713c2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DontReuseArgumentSpaceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java @@ -24,17 +24,17 @@ */ /* */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DumpPathTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DumpPathTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DumpPathTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DumpPathTest.java index c2619983bfdf..15d576a8965c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DumpPathTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DumpPathTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DynamicConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DynamicConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java index 432635389d8f..621bdbd541cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/DynamicConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.invoke.MethodHandles; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EarlyGVNTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EarlyGVNTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java index f3a73cb55a6d..a472d2a84eda 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EarlyGVNTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.test.EarlyGVNTest.NodeCount.count; -import static org.graalvm.compiler.core.test.EarlyGVNTest.NodeCount.invariantCount; +import static jdk.compiler.graal.core.test.EarlyGVNTest.NodeCount.count; +import static jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.ArrayLengthNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java index dedd2b10d3e0..008b30d087c3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EnumSwitchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EnumValuesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EnumValuesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java index 539d93d45c6b..0131873e1132 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/EnumValuesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java index 285f3ee70a96..af241eda6942 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FinalizableSubclassTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,18 +30,18 @@ import java.lang.reflect.Constructor; import java.util.HashMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.java.RegisterFinalizerNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java index 33003d052ee1..906f309aacde 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FindUniqueConcreteMethodBugTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import jdk.vm.ci.meta.Assumptions.AssumptionResult; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java index f3e8f1d40594..4593f3442f48 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FindUniqueDefaultMethodTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +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 org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java index 78b34e51eebe..fcc1fa7fede7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatOptimizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatingDivTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatingDivTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java index d3ac645a7243..0c3b5126da8a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatingDivTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ListIterator; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.FloatingIntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.LoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java index 31dedcba1190..64b9c8f45aa0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FloatingReadTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.MonitorExit; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FuzzTest36456.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FuzzTest36456.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java index 4866765ec415..2f449c2a7a24 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FuzzTest36456.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; public class FuzzTest36456 extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FuzzTest36457.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FuzzTest36457.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java index cf0ad7975f40..9d2f82b96862 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/FuzzTest36457.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; public class FuzzTest36457 extends GraalCompilerTest { public static volatile char[] field2; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java index b4158747e33d..bbd18e357ed8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalCompilerAssumptionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.compiler.graal.code.CompilationResult; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java index 0a20443e19e5..a09290e2b539 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static java.lang.reflect.Modifier.isStatic; import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI; -import static org.graalvm.compiler.nodes.ConstantNode.getConstantNodes; -import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_NO_EXCEPTION; -import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION; +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 java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -57,85 +57,85 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.function.Supplier; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.api.test.ModuleSupport; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.CompilationPrinter; -import org.graalvm.compiler.core.GraalCompiler; -import org.graalvm.compiler.core.GraalCompiler.Request; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.phases.fuzzing.PhasePlanSerializer; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpHandler; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.hotspot.HotSpotGraphBuilderPhase; -import org.graalvm.compiler.java.BytecodeParser; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.BreakpointNode; -import org.graalvm.compiler.nodes.Cancellable; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ProxyNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.SafepointNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.java.AccessFieldNode; -import org.graalvm.compiler.nodes.spi.LoweringProvider; -import org.graalvm.compiler.nodes.spi.ProfileProvider; -import org.graalvm.compiler.nodes.spi.Replacements; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.OptimisticOptimizations.Optimization; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.Speculative; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.info.InlineInfo; -import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.TargetProvider; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.After; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java index 036280a57c42..8381b1ddc6e5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraalDebugHandlersFactoryTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.File; import java.io.IOException; @@ -33,15 +33,15 @@ import java.nio.file.Paths; import java.util.Comparator; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.PathUtilities; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Assume; import org.junit.Test; -@AddExports("jdk.internal.vm.compiler/org.graalvm.compiler.printer") +@AddExports("jdk.internal.vm.compiler/jdk.compiler.graal.printer") public class GraalDebugHandlersFactoryTest extends GraalCompilerTest { @Test diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphDumpingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphDumpingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java index 4ee7a8fcc334..5d94677863c5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphDumpingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.IOException; import java.nio.file.Paths; import java.util.Arrays; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +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 org.graalvm.word.LocationIdentity; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java index 5de7a47fd608..4b9bc97a6aae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphEncoderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.nodes.EncodedGraph; -import org.graalvm.compiler.nodes.GraphEncoder; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphPrinterTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphPrinterTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java index 1e4be495fc52..6a6e64bf5d14 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphPrinterTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.printer.CanonicalStringGraphPrinter; +import jdk.compiler.graal.printer.CanonicalStringGraphPrinter; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java index ef10bc5929b3..8943511b16cb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphResetDebugTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java index 98ef8852842c..05dd38f9935c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphScheduleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.phases.schedule.SchedulePhase; +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 org.junit.Assert; import jdk.vm.ci.meta.SpeculationLog; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphUtilOriginalValueTests.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphUtilOriginalValueTests.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java index e574ad8ed4c3..e29fc750588f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GraphUtilOriginalValueTests.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.invoke.ConstantCallSite; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; -import org.graalvm.compiler.nodes.util.GraphUtil; +import jdk.compiler.graal.nodes.util.GraphUtil; import org.junit.Assert; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java index d37e1815dbe3..eefbf8e86ec2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/GuardPrioritiesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableCount.hasCount; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableIsEmpty.isNotEmpty; +import static jdk.compiler.graal.graph.test.matchers.NodeIterableCount.hasCount; +import static jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodes.GuardNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.IntegerLowerThanNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; import jdk.vm.ci.meta.SpeculationLog; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/HashCodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/HashCodeTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/HashCodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/HashCodeTest.java index 1341caf7f531..eb193e4afc9a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/HashCodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/HashCodeTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.phases.MidTier; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfCanonicalizerSwapTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfCanonicalizerSwapTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java index 23aefbc28982..2d2033080138 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfCanonicalizerSwapTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java index 11d4e85360b4..713e2846113a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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 org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfReorderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfReorderTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfReorderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfReorderTest.java index d27ce1c76311..cc5cf4d3eddf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IfReorderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfReorderTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; import java.io.Serializable; import java.util.ArrayList; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java index 986c8374e62d..67ae97c42f73 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ImplicitNullCheckTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java index 33cbf5efa741..47f1620abe89 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InfopointReasonTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.GraalCompiler.compileGraph; -import static org.graalvm.compiler.core.common.GraalOptions.OptAssumptions; +import static jdk.compiler.graal.core.GraalCompiler.compileGraph; +import static jdk.compiler.graal.core.common.GraalOptions.OptAssumptions; import static org.junit.Assert.assertNotNull; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java index f2a21aa14107..59b5f9e88011 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InstalledCodeInvalidationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java index a77973e3b851..e33be66dc8bf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerBoxEqualsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.nodes.IfNode; +import jdk.compiler.graal.nodes.calc.ObjectEqualsNode; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivPowerOf2Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivPowerOf2Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java index c32133a2aeb6..31bf68127d07 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivPowerOf2Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.RightShiftNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; +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 org.junit.Test; public class IntegerDivPowerOf2Test extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivRemCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivRemCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java index e4499db8052d..ecafc8ba4eef 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivRemCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.SignedRemNode; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivRemConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivRemConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java index 08971a748bb6..f387418bcef6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerDivRemConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java @@ -24,7 +24,7 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java index 4e38604bb308..6afeaed4caa3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerEqualsCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Optional; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.GraalCompiler; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.XorNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.FinalCanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Test; public class IntegerEqualsCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java index ab0352a6af45..8d535e747a13 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.type.IntegerStamp; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.common.type.IntegerStamp; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java index 61fa447cd4f2..9585533b2da3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticTestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticTestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java index 980a165105e6..7c6e8188c75d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerLowerThanCommonArithmeticTestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.options.OptionValues; +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 java.util.Collections; import java.util.Set; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java index 82cabc858ee8..e4c22d524b46 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerStampMulFoldTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Collection; -import org.graalvm.compiler.core.common.type.IntegerStamp; +import jdk.compiler.graal.core.common.type.IntegerStamp; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerStampShiftTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerStampShiftTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java index e872ac01b3c3..e5083d8148b2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IntegerStampShiftTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java index 79a3e6bc4e99..0a4429bc0f66 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InterfaceMethodHandleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import org.graalvm.compiler.api.test.ExportingClassLoader; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.debug.DebugContext; +import jdk.compiler.graal.api.test.ExportingClassLoader; +import jdk.compiler.graal.code.CompilationResult; +import jdk.compiler.graal.debug.DebugContext; import org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvocationPluginsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvocationPluginsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java index 3bdeb12378d7..e37f8716fc24 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvocationPluginsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.LateRegistration; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java index f330a6eb7e1f..514ec30c7633 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvokeExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.HashMap; import java.util.Map; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; public class InvokeExceptionTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java index ea1357d298c0..04ff7fc52842 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/InvokeHintsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.HashMap; import java.util.Map; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; public class InvokeHintsTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IsArrayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IsArrayTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IsArrayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IsArrayTest.java index e8fba979f4f6..8cdf508975e7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/IsArrayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IsArrayTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.Serializable; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java index 3c0569ed629c..2910cbf1301f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LockEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.MonitorEnterNode; -import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.LockEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java index d198a217be18..9ba30e349410 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LongNodeChainTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.extended.OpaqueNode; -import org.graalvm.compiler.nodes.extended.OpaqueValueNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java index 1374a996e2b9..99c0b3e5146a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LoopFullUnrollTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.spi.CoreProviders; +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 org.junit.Test; public class LoopFullUnrollTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java index 88001b1658b3..b5c971d4bffe 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/LoopUnswitchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.loop.phases.LoopUnswitchingPhase; -import org.graalvm.compiler.nodes.ControlSplitNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.SwitchNode; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopPolicies; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java index e0a055436525..a02133dbae4a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MarkUnsafeAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.policy.InlineEverythingPolicy; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MaskingOptimizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MaskingOptimizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java index 904b739da371..aba374ad1020 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MaskingOptimizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.OrNode; -import org.graalvm.compiler.nodes.calc.ShiftNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.calc.OrNode; +import jdk.compiler.graal.nodes.calc.ShiftNode; import org.junit.Test; public class MaskingOptimizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MatchRuleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MatchRuleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java index 4b215a9fab7a..dd1313edb973 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MatchRuleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.function.Predicate; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.LIRPhase; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MathCopySignStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MathCopySignStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java index 2e396963673b..79a72d15f405 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MathCopySignStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MathSignumStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MathSignumStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java index fff5aa17db18..e2099d3de858 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MathSignumStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java index d022bab72e63..313aad593c77 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryArithmeticTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.options.OptionValues; public class MemoryArithmeticTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java index e44f328d0289..f2b8024d0042 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryGraphCanonicalizeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.phases.tiers.Suites; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.memory.WriteNode; +import jdk.compiler.graal.phases.tiers.Suites; import org.junit.Test; public class MemoryGraphCanonicalizeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java index a54588088642..452f5dcbe944 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MemoryScheduleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java @@ -22,41 +22,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.common.GraalOptions.OptImplicitNullChecks; -import static org.graalvm.compiler.core.common.GraalOptions.OptScheduleOutOfLoops; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableCount.hasCount; +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 org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.LowTierLoweringPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.common.RemoveValueProxyPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java index 8758a5364029..71bb50dfc2a6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MergeCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.phases.OptimisticOptimizations; import org.junit.Test; public class MergeCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java index 661a51380b26..cafaed40ac8e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MethodHandleEagerResolution.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; @@ -30,10 +30,10 @@ import org.junit.Test; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.test.AddExports; +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; // Export needed to open String.value field to reflection by this test @AddExports("java.base/java.lang") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java index d6495ca390c0..d6874fcbd95b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MonitorGraphTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.HashMap; import java.util.Map; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MoveGuardsLoopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MoveGuardsLoopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java index 95a4f2299dc8..00b158ff03e2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MoveGuardsLoopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.EnumSet; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.options.OptionValues; +import jdk.compiler.graal.phases.common.ConditionalEliminationPhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MulNegateTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MulNegateTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MulNegateTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MulNegateTest.java index 90d68978af95..cbb603cb4281 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/MulNegateTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MulNegateTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.calc.NegateNode; +import jdk.compiler.graal.nodes.calc.NegateNode; import org.junit.Test; public class MulNegateTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java index 8aebd7013392..47e1d71ee498 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NarrowingReadTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NegateCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NegateCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java index 8abc60e9e73a..bce395736561 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NegateCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java @@ -23,12 +23,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.calc.RightShiftNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; +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 org.junit.Test; public class NegateCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NestedArithmeticTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NestedArithmeticTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java index 5cba3c706d70..ef8928e89da5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NestedArithmeticTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java index 1b674c05a76b..cd61e1ad0061 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NestedLoopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NewInstanceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NewInstanceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java index 83114d498122..504dbd43648e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NewInstanceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; import java.lang.reflect.Constructor; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodeCopyWithInputsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodeCopyWithInputsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java index 2ddb80049483..df8e73e4941d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodeCopyWithInputsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.nodes.FrameState; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Test; public class NodeCopyWithInputsTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodeMapGraphTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodeMapGraphTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java index 3d594da6dd8a..6f6dc577cc40 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodeMapGraphTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.graalvm.collections.MapCursor; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; +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 org.junit.Test; public class NodeMapGraphTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java index 2405ed5f92e5..7aa78c18ad67 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodePosIteratorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.Iterator; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.graph.NodeSuccessorList; -import org.graalvm.compiler.graph.Position; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.MergeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java index a26dbfac259c..f99abc0b3d59 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/NodePropertiesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.SimplifierTool; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase.CustomSimplification; -import org.graalvm.compiler.phases.contract.NodeCostUtil; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ObjectSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ObjectSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java index 19a0cd08a6f5..04c2d9aae8b6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ObjectSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OffHeapUnsafeAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OffHeapUnsafeAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java index 81502aecabd9..1f7635c1b039 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OffHeapUnsafeAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.memory.ReadNode; +import jdk.compiler.graal.nodes.NamedLocationIdentity; +import jdk.compiler.graal.nodes.memory.ReadNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java index a11bb6742c78..c8936eb2b453 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OnStackReplacementTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptimizeExtendsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptimizeExtendsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java index 121ec68ec8ef..5ec0bba532e2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptimizeExtendsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptimizedBoxNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptimizedBoxNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java index 6ad6ba6a822d..d4ca85189085 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptimizedBoxNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.BoxNode; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.BoxNodeIdentityPhase; -import org.graalvm.compiler.phases.common.BoxNodeOptimizationPhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.util.GraphOrder; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java index bf0b93183e7d..d41572a450a3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/OptionsVerifierTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static java.lang.String.format; @@ -35,11 +35,11 @@ import java.util.Set; import java.util.TreeSet; -import org.graalvm.compiler.options.OptionDescriptor; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionsParser; -import org.graalvm.compiler.serviceprovider.GraalServices; +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 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(// - "org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions")); + "jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions")); @Test public void verifyOptions() throws IOException { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java index ceefdd3cb250..e91f586fe8e4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PhiCreationTests.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValuePhiNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java index 7d2f10802e1b..c3fecdfb7397 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ProfilingInfoTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.Serializable; -import org.graalvm.compiler.test.SubprocessUtil; +import jdk.compiler.graal.test.SubprocessUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java index ec47d4dc5842..09a29b1df2ef 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PushNodesThroughPiTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; +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; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java index 4c79b03848a5..4778f10de4d1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/PushThroughIfTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.util.GraphUtil; +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 org.junit.Test; public class PushThroughIfTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java index 865ce3e1689d..59331dfea18f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadAfterCheckCastTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadConstantFoldingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadConstantFoldingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java index eb767a13e0de..cdfe2dd6d58b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadConstantFoldingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.nodes.extended.OpaqueNode; -import org.graalvm.compiler.nodes.extended.OpaqueValueNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadConstantFoldingTestGenerator.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadConstantFoldingTestGenerator.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java index af6d7345c306..8d7733d31e51 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReadConstantFoldingTestGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.PrintStream; import java.util.EnumSet; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java index 285a73600212..f3b387b69e27 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReassociateAndCanonicalTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Random; -import org.graalvm.compiler.graph.IterableNodeType; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +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 org.junit.Test; import jdk.vm.ci.aarch64.AArch64; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReassociationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReassociationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociationTest.java index 7dd2a759e387..6435a84f1423 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReassociationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociationTest.java @@ -23,15 +23,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.FilteredNodeIterable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode; -import org.graalvm.compiler.phases.common.ReassociationPhase; +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; import org.junit.Test; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java index 96908f30fc13..848b34ef5b71 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReentrantBlockIteratorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.phases.graph.ReentrantBlockIterator; -import org.graalvm.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure; -import org.graalvm.compiler.phases.schedule.SchedulePhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java index a4f4ada10a97..71077e794bbc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReferenceGetLoopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.ref.Reference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.nodes.memory.MemoryAccess; +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 org.graalvm.word.LocationIdentity; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java index bcc3524c2370..c6e768b154a4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReflectionOptionDescriptors.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionDescriptor; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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; /** * An implementation of {@link OptionDescriptor} that uses reflection to create descriptors from a diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ResolveDynamicConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ResolveDynamicConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java index 546a8c63b0fa..d861bae97b31 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ResolveDynamicConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.serviceprovider.GraalServices; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReverseBytesIntoArrayRegressionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReverseBytesIntoArrayRegressionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java index 093c3d95100e..e263b3866870 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ReverseBytesIntoArrayRegressionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Formatter; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java index d8ce57f8feb1..c7a9e9b29d99 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ScalarTypeSystemTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.spi.CoreProviders; +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 org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SchedulingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SchedulingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest.java index a5a749e298bf..6ee5f6d00cc6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SchedulingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; +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 org.junit.Test; public class SchedulingTest extends GraphScheduleTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java index 08f0a87ddffa..650f1d95eaca 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SchedulingTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptDuring; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StateSplit; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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 org.junit.Test; public class SchedulingTest2 extends GraphScheduleTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java index 2225bfb3c0d1..610d019b98f2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ShortCircuitNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; +import jdk.compiler.graal.core.test.ea.EATestBase; import org.junit.Test; -import org.graalvm.compiler.core.test.ea.EATestBase.TestClassInt; - public class ShortCircuitNodeTest extends GraalCompilerTest { @Test @@ -36,8 +35,8 @@ public void test1() { executeActual(getResolvedJavaMethod("test1Snippet"), 1, 2); } - public static final TestClassInt field = null; - public static TestClassInt field2 = null; + public static final EATestBase.TestClassInt field = null; + public static EATestBase.TestClassInt field2 = null; @SuppressWarnings("unused") public static void test1Snippet(int a, int b) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java index fa96151bf8d5..7b3f52eb123e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SimpleCFGTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.ControlSplitNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.MergeNode; -import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.debug.ControlFlowAnchored; -import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SingleImplementorInterfaceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SingleImplementorInterfaceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java index a0c1161ee2f4..ae85dfcc1069 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SingleImplementorInterfaceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java @@ -23,14 +23,14 @@ * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SingleRunSubphaseTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SingleRunSubphaseTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java index fd435a2a7a62..d62cece0ce95 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SingleRunSubphaseTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; +import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; import java.util.Optional; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.SingleRunSubphase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java index fd3094448878..04cf472a980c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpectreFenceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java @@ -23,23 +23,23 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.AllTargets; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.GuardTargets; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpeculativeExecutionBarriers; +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 org.junit.Assume.assumeTrue; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.SpectrePHTMitigations; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpeculativeGuardMovementTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpeculativeGuardMovementTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java index 376cd76d8028..1519e5be5a78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpeculativeGuardMovementTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpeculativeGuardMovementTrivialDeoptTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpeculativeGuardMovementTrivialDeoptTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java index b9cf86aba128..f616020bb411 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SpeculativeGuardMovementTrivialDeoptTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.EnumSet; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import org.junit.Test; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java index f748e7f8203c..096db6058612 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StableArrayReadFoldingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.stream.IntStream; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java index 018ab9830cce..24c70da73541 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StampCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; +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 org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java index f16603b1f4f2..c6a53072d2b1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StampMemoryAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.reflect.Field; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; +import jdk.compiler.graal.core.common.type.Stamp; +import jdk.compiler.graal.core.common.type.StampFactory; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java index e0fe02bc4536..7d1f662eb664 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StaticInterfaceFieldTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java @@ -22,29 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; +package jdk.compiler.graal.core.test; import java.lang.reflect.Method; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.VerifyPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Assume; import org.junit.Test; @@ -92,7 +90,7 @@ private void eagerlyParseMethod(Class clazz, String methodName) { final Method m = getMethod(clazz, methodName); ResolvedJavaMethod method = metaAccess.lookupJavaMethod(m); - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); DebugContext debug = new Builder(options).build(); StructuredGraph graph = new StructuredGraph.Builder(options, debug).method(method).build(); try (DebugCloseable s = debug.disableIntercept(); DebugContext.Scope ds = debug.scope("GraphBuilding", graph, method)) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StraighteningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StraighteningTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StraighteningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StraighteningTest.java index 7b45333a5449..6a558abb680a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/StraighteningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StraighteningTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.compiler.graal.debug.DebugContext; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; public class StraighteningTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordArrayStoreTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordArrayStoreTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java index 2342f8e8ea9b..4adf301b2d18 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordArrayStoreTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordFieldStoreTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordFieldStoreTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java index 023de281433d..216c62fc4180 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordFieldStoreTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordInputTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordInputTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java index 36395f9bc3a6..aee277fea74f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordInputTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordInputTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordInputTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java index 24e3b08b980a..e6f1da506420 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordInputTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordReturnTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordReturnTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java index 4e9b0210a042..a5fca7b07a47 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordReturnTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordTestUtil.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordTestUtil.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java index c81171fb3009..c1013f9b4ff5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubWordTestUtil.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.test.GraalTest; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.test.GraalTest; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; import org.objectweb.asm.Opcodes; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubprocessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubprocessTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubprocessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubprocessTest.java index 5abf8276da54..50e65f3e24c8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SubprocessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubprocessTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.java; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +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 java.io.IOException; import java.util.ArrayList; @@ -34,8 +34,8 @@ import java.util.List; import java.util.function.Predicate; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +import jdk.compiler.graal.test.SubprocessUtil; +import jdk.compiler.graal.test.SubprocessUtil.Subprocess; public abstract class SubprocessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java index 9e9a16a990c5..ecd73969395d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; import org.junit.Test; public class SwitchCanonicalizerTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java index 39a3cbf26d25..1b5a5735eff3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchDyingLoopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableCount.hasCount; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; +import static jdk.compiler.graal.graph.test.matchers.NodeIterableCount.hasCount; +import static jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertThat; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java index 2edc2918612d..49af5d114119 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchFoldingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.test.ExportingClassLoader; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; +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 org.junit.Assert; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchTest.java index d2e5a216105e..2706738f8813 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/SwitchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestAutoboxConf.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestAutoboxConf.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java index 48caa1e0efe7..b34a11f4d948 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestAutoboxConf.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.reflect.Field; import java.util.ArrayList; -import org.graalvm.compiler.phases.common.BoxNodeOptimizationPhase; +import jdk.compiler.graal.phases.common.BoxNodeOptimizationPhase; /** * Independent test program to test if the {@link BoxNodeOptimizationPhase} respects the caching diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestBasePhase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestBasePhase.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestBasePhase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestBasePhase.java index a4f42f0ffeff..9380864e35b2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestBasePhase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestBasePhase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Optional; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.phases.BasePhase; +import jdk.compiler.graal.nodes.GraphState; +import jdk.compiler.graal.phases.BasePhase; /** * Base class for {@link BasePhase}s used in tests. The diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestPhase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestPhase.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestPhase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestPhase.java index 0c8c4942651c..70c37ddcfb36 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TestPhase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Optional; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.Phase; +import jdk.compiler.graal.nodes.GraphState; +import jdk.compiler.graal.phases.BasePhase; +import jdk.compiler.graal.phases.Phase; /** * Base class for {@link Phase}s used in tests. The {@link BasePhase#notApplicableTo(GraphState)} diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TrivialInliningExplosionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TrivialInliningExplosionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java index 6c4e1ff00999..3f1b54249dae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TrivialInliningExplosionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.java.BytecodeParserOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TwoSlotMarkerClearingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TwoSlotMarkerClearingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java index e9f826708fd5..1e445e58880d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TwoSlotMarkerClearingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java index bab4285aead5..e2f5a8f5e549 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TypeSystemTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.io.BufferedInputStream; import java.io.ByteArrayInputStream; @@ -30,19 +30,19 @@ import java.io.IOException; import java.io.InputStream; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java index 4b6b0fe6d18b..55f19daed6f9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/TypeWriterTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.core.common.util.TypeConversion; -import org.graalvm.compiler.core.common.util.TypeReader; -import org.graalvm.compiler.core.common.util.TypeWriter; -import org.graalvm.compiler.core.common.util.UnsafeArrayTypeReader; -import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter; +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; public class TypeWriterTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnbalancedLockingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnbalancedLockingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java index 434e95809eca..1e99b1164d05 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnbalancedLockingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java @@ -22,19 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.reflect.InvocationTargetException; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.java.BciBlockMapping; -import org.graalvm.compiler.java.BytecodeParserOptions; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Ignore; import org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import org.objectweb.asm.Type; /** * Test class exercising irreducible loop duplication logic in {@link BciBlockMapping} in @@ -179,7 +180,7 @@ private static void createIrreducibleMethod(ClassWriter cw) { snippet.visitVarInsn(ALOAD, 6); snippet.visitInsn(MONITORENTER); - snippet.visitMethodInsn(INVOKESTATIC, "org/graalvm/compiler/core/test/UnbalancedLockingTest$ABC", "test", "()V", false); + snippet.visitMethodInsn(INVOKESTATIC, Type.getInternalName(UnbalancedLockingTest.class) + "$ABC", "test", "()V", false); snippet.visitVarInsn(ALOAD, 6); snippet.visitInsn(MONITOREXIT); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java index 62b81c57d653..a7934c3bba68 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnbalancedMonitorsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UncheckedInterfaceProviderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UncheckedInterfaceProviderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java index c9dbe80b8386..3bb85a2fbc61 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UncheckedInterfaceProviderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import jdk.vm.ci.meta.ResolvedJavaType; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.debug.BlackholeNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider; -import org.graalvm.compiler.nodes.type.StampTool; +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 org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeCopyMemoryTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeCopyMemoryTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java index ff28c6d10abc..d400503b6c78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeCopyMemoryTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeGetStableArrayElement.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeGetStableArrayElement.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java index 0d56628a2b3f..cb23b06ca12a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeGetStableArrayElement.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Assert; import jdk.internal.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java index b20176cb52cc..cd75873a9c6b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeReadEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import static org.graalvm.compiler.api.directives.GraalDirectives.opaque; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.UnsafeAccessNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; -import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java index 1226a3270e8a..4a56bd137736 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsafeVirtualizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Arrays; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.ea.EATestBase.TestClassInt; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assume; import org.junit.Test; @@ -57,68 +57,68 @@ private static void sideEffect() { } public static int unsafeSnippet1(double i1, boolean c) { - TestClassInt a = new TestClassInt(); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); + EATestBase.TestClassInt a = new EATestBase.TestClassInt(); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); sideEffect(); if (c) { GraalDirectives.deoptimize(); } - return UNSAFE.getInt(a, TestClassInt.fieldOffset1) + UNSAFE.getInt(a, TestClassInt.fieldOffset2); + return UNSAFE.getInt(a, EATestBase.TestClassInt.fieldOffset1) + UNSAFE.getInt(a, EATestBase.TestClassInt.fieldOffset2); } public static long unsafeSnippet2a(int i1, boolean c) { - TestClassInt a = new TestClassInt(); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); + EATestBase.TestClassInt a = new EATestBase.TestClassInt(); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); a.setFirstField(i1); sideEffect(); if (c) { GraalDirectives.deoptimize(); } - return UNSAFE.getLong(a, TestClassInt.fieldOffset1); + return UNSAFE.getLong(a, EATestBase.TestClassInt.fieldOffset1); } public static long unsafeSnippet2b(int i1, boolean c) { - TestClassInt a = new TestClassInt(); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); + EATestBase.TestClassInt a = new EATestBase.TestClassInt(); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); a.setSecondField(i1); sideEffect(); if (c) { GraalDirectives.deoptimize(); } - return UNSAFE.getLong(a, TestClassInt.fieldOffset1); + return UNSAFE.getLong(a, EATestBase.TestClassInt.fieldOffset1); } public static long unsafeSnippet3a(int i1, boolean c) { - TestClassInt a = new TestClassInt(); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); - UNSAFE.putInt(a, TestClassInt.fieldOffset1, i1); + EATestBase.TestClassInt a = new EATestBase.TestClassInt(); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); + UNSAFE.putInt(a, EATestBase.TestClassInt.fieldOffset1, i1); sideEffect(); if (c) { GraalDirectives.deoptimize(); } - return UNSAFE.getLong(a, TestClassInt.fieldOffset1); + return UNSAFE.getLong(a, EATestBase.TestClassInt.fieldOffset1); } public static long unsafeSnippet3b(int i1, boolean c) { - TestClassInt a = new TestClassInt(); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); - UNSAFE.putInt(a, TestClassInt.fieldOffset2, i1); + EATestBase.TestClassInt a = new EATestBase.TestClassInt(); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); + UNSAFE.putInt(a, EATestBase.TestClassInt.fieldOffset2, i1); sideEffect(); if (c) { GraalDirectives.deoptimize(); } - return UNSAFE.getLong(a, TestClassInt.fieldOffset1); + return UNSAFE.getLong(a, EATestBase.TestClassInt.fieldOffset1); } public static int unsafeSnippet4(double i1, boolean c) { - TestClassInt a = new TestClassInt(); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); - UNSAFE.putDouble(a, TestClassInt.fieldOffset1, i1); + EATestBase.TestClassInt a = new EATestBase.TestClassInt(); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); + UNSAFE.putDouble(a, EATestBase.TestClassInt.fieldOffset1, i1); sideEffect(); if (c) { GraalDirectives.deoptimize(); } - return UNSAFE.getInt(a, TestClassInt.fieldOffset1) + UNSAFE.getInt(a, TestClassInt.fieldOffset2); + return UNSAFE.getInt(a, EATestBase.TestClassInt.fieldOffset1) + UNSAFE.getInt(a, EATestBase.TestClassInt.fieldOffset2); } @SuppressWarnings("cast") @@ -536,7 +536,7 @@ private void performTest(String snippet, boolean shouldEscapeRead, boolean shoul } public void testPartialEscapeReadElimination(String snippet, boolean canonicalizeBefore, boolean shouldEscapeRead, boolean shouldEscapeWrite, Object... args) { - assert TestClassInt.fieldOffset1 % 8 == 0 : "First of the two int-fields must be 8-byte aligned"; + assert EATestBase.TestClassInt.fieldOffset1 % 8 == 0 : "First of the two int-fields must be 8-byte aligned"; ResolvedJavaMethod method = getResolvedJavaMethod(snippet); StructuredGraph graph = parseEager(snippet, AllowAssumptions.NO); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnschedulableGraphTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnschedulableGraphTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java index da56d90170d3..766ac060e8aa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnschedulableGraphTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; +import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.extended.OpaqueNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsignedLongTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsignedLongTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java index 00e556940cb8..1e6877ee152e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnsignedLongTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.util.UnsignedLong; +import jdk.compiler.graal.core.common.util.UnsignedLong; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnusedArray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnusedArray.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnusedArray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnusedArray.java index 4be8444b7889..3e0e53990c22 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/UnusedArray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnusedArray.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; +import static jdk.compiler.graal.graph.test.matchers.NodeIterableIsEmpty.isEmpty; import static org.junit.Assert.assertThat; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.NewArrayNode; +import jdk.compiler.graal.graph.iterators.NodeIterable; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.java.NewArrayNode; import org.junit.Test; public class UnusedArray extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyArchUsageInPlugins.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyArchUsageInPlugins.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java index 1d9d7726c49f..932d2add6514 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyArchUsageInPlugins.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.code.Architecture; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java index 6e532341187f..101e0efec77d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.RetryableBailoutException; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.code.BailoutException; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java index 01d93b0ce3ca..40a6bf864784 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyBailoutUsageTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java @@ -22,32 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; +package jdk.compiler.graal.core.test; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.RetryableBailoutException; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.VerifyPhase.VerificationError; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Test; import jdk.vm.ci.code.BailoutException; @@ -126,7 +124,7 @@ private static void testBailoutUsage(Class c) { GraphBuilderConfiguration config = GraphBuilderConfiguration.getDefault(plugins).withEagerResolving(true).withUnresolvedIsError(true); graphBuilderSuite.appendPhase(new GraphBuilderPhase(config)); HighTierContext context = new HighTierContext(providers, graphBuilderSuite, OptimisticOptimizations.NONE); - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); DebugContext debug = new Builder(options).build(); for (Method m : c.getDeclaredMethods()) { if (!Modifier.isNative(m.getModifiers()) && !Modifier.isAbstract(m.getModifiers())) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java similarity index 69% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java index e9320a5e0954..dc52a3959f67 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyDebugUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java @@ -22,27 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.debug.DebugContext.BASIC_LEVEL; +import static jdk.compiler.graal.debug.DebugContext.BASIC_LEVEL; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.OptimizationLogImpl; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; - +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.compiler.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.PrimitiveConstant; @@ -111,21 +121,21 @@ protected void verify(StructuredGraph graph, CoreProviders context) { * outlined by {@link DebugContext#BASIC_LEVEL}. If you add a *justified* graph dump at this * level, then update the allow list. */ - private static final Set BasicLevelStructuredGraphDumpAllowList = new HashSet<>(Arrays.asList( - "org.graalvm.compiler.phases.BasePhase.dumpAfter", - "org.graalvm.compiler.phases.BasePhase.dumpBefore", - "org.graalvm.compiler.core.GraalCompiler.emitFrontEnd", - "org.graalvm.compiler.truffle.compiler.PerformanceInformationHandler.reportPerformanceWarnings", - "org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl.compilePEGraph", - "org.graalvm.compiler.core.test.VerifyDebugUsageTest$ValidDumpUsagePhase.run", - "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidConcatDumpUsagePhase.run", - "org.graalvm.compiler.core.test.VerifyDebugUsageTest$InvalidDumpUsagePhase.run", - "org.graalvm.compiler.hotspot.SymbolicSnippetEncoder.verifySnippetEncodeDecode", - "com.oracle.graal.pointsto.phases.InlineBeforeAnalysis.decodeGraph", - "com.oracle.svm.hosted.classinitialization.SimulateClassInitializerSupport.decodeGraph", - "com.oracle.svm.hosted.classinitialization.SimulateClassInitializerAbortException.doAbort", - "org.graalvm.compiler.truffle.compiler.phases.inlining.CallTree.dumpBasic", - "org.graalvm.compiler.truffle.compiler.phases.inlining.GraphManager.peRoot")); + private static final Set BasicLevelStructuredGraphDumpAllowList = Set.of( + MethodSource.of(BasePhase.class, "dumpAfter"), + MethodSource.of(BasePhase.class, "dumpBefore"), + MethodSource.of(GraalCompiler.class, "emitFrontEnd"), + MethodSource.of(PerformanceInformationHandler.class, "reportPerformanceWarnings"), + MethodSource.of(TruffleCompilerImpl.class, "compilePEGraph"), + MethodSource.of(VerifyDebugUsageTest.ValidDumpUsagePhase.class, "run"), + MethodSource.of(VerifyDebugUsageTest.InvalidConcatDumpUsagePhase.class, "run"), + MethodSource.of(VerifyDebugUsageTest.InvalidDumpUsagePhase.class, "run"), + MethodSource.of(SymbolicSnippetEncoder.class, "verifySnippetEncodeDecode"), + MethodSource.of("com.oracle.graal.pointsto.phases.InlineBeforeAnalysis", "decodeGraph"), + MethodSource.of("com.oracle.svm.hosted.classinitialization.SimulateClassInitializerSupport", "decodeGraph"), + MethodSource.of("com.oracle.svm.hosted.classinitialization.SimulateClassInitializerAbortException", "doAbort"), + MethodSource.of(CallTree.class, "dumpBasic"), + MethodSource.of(CallTree.class, "GraphManager", "peRoot")); /** * The set of methods allowed to call a {@code Debug.dump(...)} method with the {@code level} @@ -136,15 +146,15 @@ protected void verify(StructuredGraph graph, CoreProviders context) { * outlined by {@link DebugContext#INFO_LEVEL}. If you add a *justified* graph dump at this * level, then update the allow list. */ - private static final Set InfoLevelStructuredGraphDumpAllowList = new HashSet<>(Arrays.asList( - "org.graalvm.compiler.core.GraalCompiler.emitFrontEnd", - "org.graalvm.compiler.phases.BasePhase.dumpAfter", - "org.graalvm.compiler.replacements.ReplacementsImpl$GraphMaker.makeGraph", - "org.graalvm.compiler.replacements.SnippetTemplate.instantiate", - "org.graalvm.compiler.replacements.SnippetTemplate.", - "org.graalvm.compiler.hotspot.SymbolicSnippetEncoder.verifySnippetEncodeDecode", - "org.graalvm.compiler.truffle.compiler.phases.inlining.CallTree.dumpInfo", - "org.graalvm.compiler.truffle.compiler.phases.inlining.GraphManager.pe")); + private static final Set InfoLevelStructuredGraphDumpAllowList = Set.of( + MethodSource.of(GraalCompiler.class, "emitFrontEnd"), + MethodSource.of(BasePhase.class, "dumpAfter"), + MethodSource.of(ReplacementsImpl.GraphMaker.class, "makeGraph"), + MethodSource.of(SnippetTemplate.class, "instantiate"), + MethodSource.of(SnippetTemplate.class, ""), + MethodSource.of(SymbolicSnippetEncoder.class, "verifySnippetEncodeDecode"), + MethodSource.of(CallTree.class, "dumpInfo"), + MethodSource.of(CallTree.class, "GraphManager", "pe")); @Override protected void verifyParameters(MetaAccessProvider metaAccess1, MethodCallTargetNode debugCallTarget, List args, ResolvedJavaType stringType, @@ -171,7 +181,7 @@ protected void verifyParameters(MetaAccessProvider metaAccess1, MethodCallTarget * the {@code Debug.*_LEVEL} constants. */ protected int verifyDumpLevelParameter(MethodCallTargetNode debugCallTarget, ResolvedJavaMethod verifiedCallee, ValueNode arg) - throws org.graalvm.compiler.phases.VerifyPhase.VerificationError { + throws VerifyPhase.VerificationError { // The 'level' arg for the Debug.dump(...) methods must be a reference to one of // the Debug.*_LEVEL constants. @@ -189,7 +199,7 @@ protected int verifyDumpLevelParameter(MethodCallTargetNode debugCallTarget, Res } protected void verifyDumpObjectParameter(MethodCallTargetNode debugCallTarget, ValueNode arg, ResolvedJavaMethod verifiedCallee, Integer dumpLevel) - throws org.graalvm.compiler.phases.VerifyPhase.VerificationError { + throws VerifyPhase.VerificationError { ResolvedJavaType argType = ((ObjectStamp) arg.stamp(NodeView.DEFAULT)).type(); if (metaAccess.lookupJavaType(Graph.class).isAssignableFrom(argType)) { verifyStructuredGraphDumping(debugCallTarget, verifiedCallee, dumpLevel); @@ -201,19 +211,18 @@ protected void verifyDumpObjectParameter(MethodCallTargetNode debugCallTarget, V * {@link DebugContext#INFO_LEVEL} only occurs in white-listed methods. */ protected void verifyStructuredGraphDumping(MethodCallTargetNode debugCallTarget, ResolvedJavaMethod verifiedCallee, Integer dumpLevel) - throws org.graalvm.compiler.phases.VerifyPhase.VerificationError { + throws VerifyPhase.VerificationError { + ResolvedJavaMethod method = debugCallTarget.graph().method(); if (dumpLevel == DebugContext.BASIC_LEVEL) { - String qualifiedMethod = debugCallTarget.graph().method().format("%H.%n"); - if (!BasicLevelStructuredGraphDumpAllowList.contains(qualifiedMethod)) { + if (BasicLevelStructuredGraphDumpAllowList.stream().noneMatch(ms -> ms.matches(method))) { throw new VerificationError( - debugCallTarget, "call to %s with level == DebugContext.BASIC_LEVEL not in %s.BasicLevelDumpAllowList.%n", verifiedCallee.format("%H.%n(%p)"), + debugCallTarget, "call to %s with level == DebugContext.BASIC_LEVEL not in %s.BasicLevelStructuredGraphDumpAllowList.%n", verifiedCallee.format("%H.%n(%p)"), getClass().getName()); } } else if (dumpLevel == DebugContext.INFO_LEVEL) { - String qualifiedMethod = debugCallTarget.graph().method().format("%H.%n"); - if (!InfoLevelStructuredGraphDumpAllowList.contains(qualifiedMethod)) { + if (InfoLevelStructuredGraphDumpAllowList.stream().noneMatch(ms -> ms.matches(method))) { throw new VerificationError( - debugCallTarget, "call to %s with level == Debug.INFO_LEVEL not in %s.InfoLevelDumpAllowList.%n", verifiedCallee.format("%H.%n(%p)"), + debugCallTarget, "call to %s with level == Debug.INFO_LEVEL not in %s.InfoLevelStructuredGraphDumpAllowList.%n", verifiedCallee.format("%H.%n(%p)"), getClass().getName()); } } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java index a819f8794ed8..eae79156ad6a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyDebugUsageTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.compiler.graal.core.test.GraalCompilerTest.getInitialOptions; import java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.VerifyPhase.VerificationError; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Test; import jdk.vm.ci.meta.MetaAccessProvider; @@ -80,7 +80,7 @@ protected void run(StructuredGraph graph) { } - private static class InvalidDumpUsagePhase extends TestPhase { + static class InvalidDumpUsagePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -88,7 +88,7 @@ protected void run(StructuredGraph graph) { } } - private static class InvalidDumpLevelPhase extends TestPhase { + static class InvalidDumpLevelPhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -96,7 +96,7 @@ protected void run(StructuredGraph graph) { } } - private static class NonConstantDumpLevelPhase extends TestPhase { + static class NonConstantDumpLevelPhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -142,7 +142,7 @@ protected void run(StructuredGraph graph) { } - private static class InvalidConcatDumpUsagePhase extends TestPhase { + static class InvalidConcatDumpUsagePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -151,7 +151,7 @@ protected void run(StructuredGraph graph) { } - private static class InvalidConcatVerifyUsagePhase extends TestPhase { + static class InvalidConcatVerifyUsagePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -160,7 +160,7 @@ protected void run(StructuredGraph graph) { } - private static class ValidLogUsagePhase extends TestPhase { + static class ValidLogUsagePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -171,7 +171,7 @@ protected void run(StructuredGraph graph) { } - private static class ValidLogAndIndentUsagePhase extends TestPhase { + static class ValidLogAndIndentUsagePhase extends TestPhase { @Override @SuppressWarnings("try") protected void run(StructuredGraph graph) { @@ -185,7 +185,7 @@ protected void run(StructuredGraph graph) { } - private static class ValidDumpUsagePhase extends TestPhase { + static class ValidDumpUsagePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -194,7 +194,7 @@ protected void run(StructuredGraph graph) { } - private static class ValidVerifyUsagePhase extends TestPhase { + static class ValidVerifyUsagePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { DebugContext debug = graph.getDebug(); @@ -203,14 +203,14 @@ protected void run(StructuredGraph graph) { } - private static class InvalidGraalErrorGuaranteePhase extends TestPhase { + static class InvalidGraalErrorGuaranteePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { GraalError.guarantee(graph.getNodes().count() > 0, "Graph must contain nodes %s %s %s", graph, graph, graph.toString()); } } - private static class ValidGraalErrorGuaranteePhase extends TestPhase { + static class ValidGraalErrorGuaranteePhase extends TestPhase { @Override protected void run(StructuredGraph graph) { GraalError.guarantee(graph.getNodes().count() > 0, "Graph must contain nodes %s", graph); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyEndlessLoops.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyEndlessLoops.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java index 476e965fe9d3..94f9217dd83f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyEndlessLoops.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.LoopEndNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.nodes.memory.MemoryKill; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; +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; /** * Verify that no loop in Graal contains endless paths - endless paths are paths from a loop end diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyFoldableMethods.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyFoldableMethods.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java index 9c4048834478..135164c4d7f4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyFoldableMethods.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import java.util.stream.Collectors; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyGetOptionsUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyGetOptionsUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java index e9a0ecfce2ed..583ea119fa65 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyGetOptionsUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.reflect.MalformedParametersException; import java.lang.reflect.Method; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyGraphUniqueUsages.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyGraphUniqueUsages.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java index 9c2c47eba9ff..f45189c1a846 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyGraphUniqueUsages.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyInstanceOfUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyInstanceOfUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java index 7b1e29a0e017..6504e86f1287 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyInstanceOfUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyIterableNodeType.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyIterableNodeType.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java index 8e2314d63ab2..7e92f1a5f4de 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyIterableNodeType.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java @@ -22,21 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.IterableNodeType; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -44,8 +45,8 @@ /** * Verifies that code which uses {@link Node} implementing {@link IterableNodeType} uses - * {@link StructuredGraph#getNodes(org.graalvm.compiler.graph.NodeClass)} and not - * {@linkplain NodeIterable#filter(Class)} to access a subset of a {@link Graph}. + * {@link StructuredGraph#getNodes(NodeClass)} and not {@linkplain NodeIterable#filter(Class)} to + * access a subset of a {@link Graph}. */ public class VerifyIterableNodeType extends VerifyPhase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyMemoryKillCheck.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyMemoryKillCheck.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java index 2bac617b91af..835b09b00e53 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyMemoryKillCheck.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.GuardNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.memory.MemoryKill; -import org.graalvm.compiler.nodes.memory.MultiMemoryKill; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyPluginFrameState.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyPluginFrameState.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java index 59780268125d..6b2d555e98ea 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyPluginFrameState.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.HashSet; import java.util.Set; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.java.FrameStateBuilder; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StateSplit; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.Proxy; -import org.graalvm.compiler.phases.VerifyPhase; -import org.graalvm.compiler.replacements.InvocationPluginHelper; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyProfileMethodUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyProfileMethodUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java index 73983de2d5a1..56dd44ebd709 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyProfileMethodUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.reflect.Method; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.ProfileProvider; -import org.graalvm.compiler.nodes.spi.ResolvedJavaMethodProfileProvider; -import org.graalvm.compiler.nodes.spi.StableProfileProvider; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySharedConstantEmptyArray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySharedConstantEmptyArray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java index 32c6c3042f11..b0f267b45c56 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySharedConstantEmptyArray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.Set; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.util.GraphUtil; +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.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySnippetProbabilities.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySnippetProbabilities.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java index ff84e4bb8596..646295bd84ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySnippetProbabilities.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.lang.annotation.Annotation; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData; -import org.graalvm.compiler.nodes.ProfileData.ProfileSource; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyStatelessPhases.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyStatelessPhases.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java index ccadff9f053e..c1f40e401b31 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyStatelessPhases.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.SingleRunSubphase; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyStringFormatterUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyStringFormatterUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java index 2c3cb2678a22..8be921aa99fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyStringFormatterUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.ArrayList; import java.util.Arrays; @@ -30,23 +30,23 @@ import java.util.List; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.type.PrimitiveStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.StoreIndexedNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySystemPropertyUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySystemPropertyUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java index db9a11af6195..98a8ca9646c1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifySystemPropertyUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.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("org.graalvm.compiler.hotspot.JVMCIVersionCheck") && caller.getName().equals("main")) { + } else if (holderQualified.equals("jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUnsafeAccess.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUnsafeAccess.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java index fe46883700ca..7f639f878698 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUnsafeAccess.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import static java.lang.reflect.Modifier.isProtected; import static java.lang.reflect.Modifier.isPublic; import java.lang.reflect.Field; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java index 3c15c7664e20..bc73463bdc8a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUpdateUsages.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import java.util.List; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.Node.Input; -import org.graalvm.compiler.graph.Node.OptionalInput; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUsageWithEquals.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUsageWithEquals.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java index 31a2e27ec497..e4f3a9fae6eb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyUsageWithEquals.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; - -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.phases.VerifyPhase; +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; import jdk.vm.ci.meta.JavaField; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVariableCasts.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVariableCasts.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java index 7bc07d8e4f6e..658dd2779d2c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVariableCasts.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.type.AbstractObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.MetaAccessProvider; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java index df1ba3d119d5..6baa1b90a1df 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java @@ -22,39 +22,39 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +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 java.lang.reflect.Method; import java.lang.reflect.Modifier; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.java.ArrayLengthNode; -import org.graalvm.compiler.nodes.spi.Virtualizable; -import org.graalvm.compiler.nodes.spi.VirtualizerTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.VerifyPhase.VerificationError; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Test; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableUsage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableUsage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java index 6c6d086873ed..f887696f78fd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VerifyVirtualizableUsage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java @@ -22,29 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.Virtualizable; -import org.graalvm.compiler.phases.VerifyPhase; +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.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; /** * Verifies that node types implementing the {@link Virtualizable} interface use it correctly. - * Implementors of {@link Virtualizable#virtualize(org.graalvm.compiler.nodes.spi.VirtualizerTool)} - * must not apply effects on their {@link Graph graph} that cannot be easily undone. + * Implementors of {@link Virtualizable#virtualize(VirtualizerTool)} must not apply effects on their + * {@link Graph graph} that cannot be easily undone. */ public class VerifyVirtualizableUsage extends VerifyPhase { @Override diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VolatileAccessReadEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VolatileAccessReadEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java index 1ec64ff4e23c..6746d936f7d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VolatileAccessReadEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java @@ -24,14 +24,14 @@ * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import jdk.vm.ci.meta.ResolvedJavaMethod; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.memory.ReadNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VolatileReadEliminateWrongMemoryStateTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VolatileReadEliminateWrongMemoryStateTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java index d3c2114a0f4c..9d613ed28beb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/VolatileReadEliminateWrongMemoryStateTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java index 084522876efb..787f8e7a74be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ZeroSignExtendTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test; +package jdk.compiler.graal.core.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java index 544257575f83..b3ee99bb5ee0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/backend/AllocatorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.backend; +package jdk.compiler.graal.core.test.backend; -import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; +import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; import java.util.HashSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.ValueProcedure; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +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 org.junit.Assert; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java index 26d20733d3ce..787ffc2fd56a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/backend/BackendTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.backend; - -import org.graalvm.compiler.core.GraalCompiler; -import org.graalvm.compiler.core.gen.LIRCompilerBackend; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java index 432e2b056473..9fd4c5876e51 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/CompiledMethodTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.deopt; +package jdk.compiler.graal.core.test.deopt; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java index cf4a7dbf4253..909a17c30ae9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/MonitorDeoptTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java @@ -24,7 +24,7 @@ */ /* */ -package org.graalvm.compiler.core.test.deopt; +package jdk.compiler.graal.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 org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.AbstractEndNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +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; public final class MonitorDeoptTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java index 2ae6f27fafad..77f034e8bbdb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/RethrowDeoptMaterializeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.core.test.deopt; +package jdk.compiler.graal.core.test.deopt; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.FrameState; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.FrameState; import org.junit.Test; public final class RethrowDeoptMaterializeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/RethrowExceptionLoopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/RethrowExceptionLoopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java index e75951d3683a..86dfdfde03a1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/RethrowExceptionLoopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java @@ -24,19 +24,19 @@ */ /* */ -package org.graalvm.compiler.core.test.deopt; +package jdk.compiler.graal.core.test.deopt; -import static org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java index d6dfe4a0e062..e3adec09c41f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/SafepointRethrowDeoptTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java @@ -24,7 +24,7 @@ */ /* */ -package org.graalvm.compiler.core.test.deopt; +package jdk.compiler.graal.core.test.deopt; import java.util.concurrent.CountDownLatch; @@ -32,8 +32,8 @@ import org.junit.Assume; import org.junit.Test; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.common.GraalOptions; +import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java index 2bd759d61558..388aea6f0275 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/deopt/SynchronizedMethodDeoptimizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.deopt; +package jdk.compiler.graal.core.test.deopt; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.core.test.ea.EATestBase.TestClassObject; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.ea.EATestBase.TestClassObject; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/AtomicVirtualizationTests.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/AtomicVirtualizationTests.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java index 662f442588e3..94092c43f84e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/AtomicVirtualizationTests.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.util.Objects; import java.util.concurrent.atomic.AtomicReference; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java index 34935170b28b..8cf53803acec 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/CountUppercaseParallelTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class CountUppercaseParallelTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java index aeb11ddd5de5..bffa9a728150 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EAMergingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import org.junit.Test; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.ValuePhiNode; +import jdk.compiler.graal.nodes.ParameterNode; +import jdk.compiler.graal.nodes.PhiNode; +import jdk.compiler.graal.nodes.ValuePhiNode; public class EAMergingTest extends EATestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java index ca0f718437f7..ab9b09ece0d4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EATestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import static org.graalvm.compiler.graph.iterators.NodePredicates.isA; +import static jdk.compiler.graal.graph.iterators.NodePredicates.isA; import java.util.List; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assert; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java index 1d1f9a9a6485..99a4ae6f7965 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/EscapeAnalysisTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.util.List; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.loop.phases.LoopPeelingPhase; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.extended.BoxNode; -import org.graalvm.compiler.nodes.extended.ValueAnchorNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/ExpandLogicTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/ExpandLogicTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java index 9864ed354613..5ee18a777e39 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/ExpandLogicTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class ExpandLogicTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java index 69de8459283b..5d94f90007b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/NestedBoxingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java index d2a1ac7a40ef..e90271e8fe14 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PEAAssertionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.code.SourceStackTraceBailoutException; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Test; public class PEAAssertionsTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java index 84d076a88482..e200375bf828 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PEAReadEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; - -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.java.StoreIndexedNode; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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; import org.junit.Test; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java index 75f624c62c1a..73762c7422f7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisIterationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.lang.ref.WeakReference; import java.util.List; -import org.graalvm.compiler.nodes.extended.BoxNode; -import org.graalvm.compiler.nodes.extended.UnboxNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java index 433720341680..420868fd23df 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.lang.ref.SoftReference; import java.lang.reflect.Array; import java.util.ArrayList; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.TypeSystemTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.extended.BoxNode; -import org.graalvm.compiler.nodes.extended.UnboxNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java index 4a29e39b3492..2868f1e7ad7b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeAnalysisTreesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.util.HashSet; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.debug.BlackholeNode; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeOptimizationLogTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeOptimizationLogTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java index 3696bd88fbf5..e72f3fcd9b9a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeOptimizationLogTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.test.TypeSystemTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpHandler; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.nodes.OptimizationLogImpl; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java index 970f82a33e1f..9fc4f5d6bcb5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeUnsafeStoreTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeWithExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeWithExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java index aec0c6060abb..98c0f702764d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PartialEscapeWithExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; public class PartialEscapeWithExceptionTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java index 9ceeb78c949c..d155fd738e47 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/PoorMansEATest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; public class PoorMansEATest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/ReadEliminationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/ReadEliminationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java index f884629e40d3..094fee83e010 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/ReadEliminationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; - -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LogicConstantNode; -import org.graalvm.compiler.nodes.ProxyNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java index dd14d6811bab..77fc57271b74 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/TrufflePEATest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.lang.reflect.Field; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Test; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java index 6e2d6dd654a9..4009ab54f9ec 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReferenceArray; -import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode; +import jdk.compiler.graal.nodes.java.LogicCompareAndSwapNode; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java index 787cf4bca50e..53a60482b4ad 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/ea/UnsafeEATest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.ea; +package jdk.compiler.graal.core.test.ea; import java.nio.ByteBuffer; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.calc.UnpackEndianHalfNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.extended.UnsafeAccessNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java index 16b71da131cf..9c7cae9cb859 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/InliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.inlining; +package jdk.compiler.graal.core.test.inlining; import java.util.regex.Pattern; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 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 org.graalvm.compiler.core.test.inlining.InliningTest.traceInliningTest.*: \\R" + - " at .*org.graalvm.compiler.core.test.inlining.InliningTest.traceInliningTest.*: org.graalvm.compiler.core.test.inlining.InliningTest.callTrivial.*: yes, inline method\\R" + - " at .*org.graalvm.compiler.core.test.inlining.InliningTest.callTrivial.*: .*\\R" + - " .* org.graalvm.compiler.core.test.inlining.InliningTest.callNonTrivial.*: .*(.*\\R)*" + - " .* org.graalvm.compiler.core.test.inlining.InliningTest.callNonTrivial.*: .*(.*\\R)*"; + 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)*"; Pattern expectedPattern = Pattern.compile(expectedRegex, Pattern.MULTILINE); Assert.assertTrue("Got: " + inliningTree, expectedPattern.matcher(inliningTree).matches()); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java index acaf1e0a9735..7a089212401b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.inlining; +package jdk.compiler.graal.core.test.inlining; -import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional; +import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.inlining.InliningUtil; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java index 4561ef4cfe46..b24c0a9afbf7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.inlining; +package jdk.compiler.graal.core.test.inlining; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; -import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional; +import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; +import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.RetryableBailoutException; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.inlining.InliningUtil; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/jfr/TestGetEventWriter.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/jfr/TestGetEventWriter.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java index 949e640622d3..501f9f237b8a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/jfr/TestGetEventWriter.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.jfr; +package jdk.compiler.graal.core.test.jfr; import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.test.SubprocessTest; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.JavaVersionUtil; -import org.graalvm.compiler.test.AddExports; -import org.graalvm.compiler.test.SubprocessUtil; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java index 24ad1788125a..c82209b8d811 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/GraalTutorial.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.tutorial; +package jdk.compiler.graal.core.test.tutorial; import java.lang.reflect.Method; import java.util.regex.Pattern; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; +import jdk.compiler.graal.bytecode.BytecodeDisassembler; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java index 795afe4f1dee..abb6c3238ee4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/InvokeGraal.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.tutorial; +package jdk.compiler.graal.core.test.tutorial; -import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest; -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest; +import static jdk.compiler.graal.core.test.GraalCompilerTest.getInitialOptions; import java.lang.reflect.Method; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.GraalCompiler; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; +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.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java index e2a0e05b531e..6ca1ab56c09b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysis.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.tutorial; +package jdk.compiler.graal.core.test.tutorial; -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; +import static jdk.compiler.graal.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 org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.graph.StatelessPostOrderNodeIterator; +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.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java index 353ce8989ae8..ebb8678019c9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/core/test/tutorial/StaticAnalysisTests.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java @@ -22,19 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.test.tutorial; +package jdk.compiler.graal.core.test.tutorial; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.Arrays; import java.util.Collection; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.core.test.tutorial.StaticAnalysis.MethodState; -import org.graalvm.compiler.core.test.tutorial.StaticAnalysis.TypeFlow; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.Test; @@ -170,15 +168,15 @@ public void test04() { assertEquals(m(sa, A.class, "foo").getFormalReturn(), t(Data.class)); } - private MethodState m(StaticAnalysis sa, Class declaringClass, String name) { + private StaticAnalysis.MethodState m(StaticAnalysis sa, Class declaringClass, String name) { return sa.getResults().lookupMethod(findMethod(declaringClass, name)); } - private TypeFlow f(StaticAnalysis sa, Class declaringClass, String name) { + private StaticAnalysis.TypeFlow f(StaticAnalysis sa, Class declaringClass, String name) { return sa.getResults().lookupField(findField(declaringClass, name)); } - private static void assertEquals(TypeFlow actual, Object... expected) { + private static void assertEquals(StaticAnalysis.TypeFlow actual, Object... expected) { Collection actualTypes = actual.getTypes(); if (actualTypes.size() != expected.length || !actualTypes.containsAll(Arrays.asList(expected))) { Assert.fail(actualTypes + " != " + Arrays.asList(expected)); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java index 6c9d86af1280..61a7948d67f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/CSVUtilTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; import static org.junit.Assert.assertEquals; @@ -32,8 +32,8 @@ import java.util.Arrays; import java.util.Collection; -import org.graalvm.compiler.debug.CSVUtil; -import org.graalvm.compiler.debug.LogStream; +import jdk.compiler.graal.debug.CSVUtil; +import jdk.compiler.graal.debug.LogStream; import org.junit.Assert; import org.junit.Test; import org.junit.experimental.runners.Enclosed; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/CompilationAlarmTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/CompilationAlarmTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java index 50fd002eef62..52c824ab22dc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/CompilationAlarmTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; import java.util.Optional; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.GraalCompiler; -import org.graalvm.compiler.core.GraalCompiler.Request; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java index 6200218e4ca8..2ba1a60f8449 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/DebugContextTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; -import static org.graalvm.compiler.debug.DebugContext.NO_DESCRIPTION; -import static org.graalvm.compiler.debug.DebugContext.NO_GLOBAL_METRIC_VALUES; +import static jdk.compiler.graal.debug.DebugContext.NO_DESCRIPTION; +import static jdk.compiler.graal.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 org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugConfig; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.debug.DebugDumpHandler; -import org.graalvm.compiler.debug.DebugHandler; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.DebugVerifyHandler; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/DebugContextTest.testLogging.input b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input similarity index 100% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/DebugContextTest.testLogging.input rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/GraalErrorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/GraalErrorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java index 807d53f5ebcd..c88f5d94192c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/GraalErrorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/LogStreamTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/LogStreamTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java index e673f994d23b..f147f953c06f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/LogStreamTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; import static org.junit.Assert.assertEquals; @@ -30,7 +30,7 @@ import java.io.PrintStream; import java.nio.charset.StandardCharsets; -import org.graalvm.compiler.debug.LogStream; +import jdk.compiler.graal.debug.LogStream; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/TTYTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TTYTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/TTYTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TTYTest.java index a735e174a4e7..8e6bd523b937 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/TTYTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TTYTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; -import org.graalvm.compiler.debug.TTY; +import jdk.compiler.graal.debug.TTY; import org.junit.Test; public class TTYTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java index 6f8856f7110a..6fac9af998c0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/TimerKeyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.debug.test; -import static org.graalvm.compiler.debug.DebugContext.NO_CONFIG_CUSTOMIZERS; +import static jdk.compiler.graal.debug.DebugContext.NO_CONFIG_CUSTOMIZERS; import static org.junit.Assert.assertEquals; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +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 org.junit.Assume; import org.junit.AssumptionViolatedException; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/VersionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/VersionsTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/VersionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/VersionsTest.java index 2edf4deed964..3791cf1e9e09 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/debug/test/VersionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/VersionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug.test; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.Versions; +import jdk.compiler.graal.debug.Versions; import org.junit.After; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/GraphTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/GraphTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/GraphTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/GraphTest.java index 828fef168747..06abd8ebb673 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/GraphTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/GraphTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.After; public abstract class GraphTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java index 66fc9da0ba1c..beb09e3efb68 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeBitMapTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.NoSuchElementException; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeBitMap; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeFormatToTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeFormatToTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java index f5b7eea86885..85163efd6364 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeFormatToTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; import java.util.Formatter; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.graph.Graph; +import jdk.compiler.graal.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeInputListTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeInputListTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java index ea72d486780a..9287ecb3d12e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeInputListTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java index 440317177f95..1e2af4ff283a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeMapTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import jdk.compiler.graal.api.test.Graal; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.options.OptionValues; +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; public class NodeMapTest extends GraphTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUnionFindTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUnionFindTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java index 510da08872c7..fc321532a437 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUnionFindTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeUnionFind; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUsageIterableTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUsageIterableTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java index cb14c33aaa9c..98a18eeae704 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUsageIterableTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java similarity index 57% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java index f313953a3fa2..a91a5c34de55 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeUsagesTests.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java @@ -22,26 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableContains.contains; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableIsEmpty.isNotEmpty; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; -import org.graalvm.compiler.graph.GraalGraphError; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.graph.NodeSuccessorList; -import org.graalvm.compiler.graph.Position; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; @@ -83,23 +82,23 @@ public void testReplaceAtUsages() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtUsages(def1); - assertThat(def0.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isEmpty()); assertEquals(3, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); - assertThat(def1.usages(), contains(use1)); - assertThat(def1.usages(), contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use1)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -113,23 +112,23 @@ public void testReplaceAtUsagesWithPredicateAll() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> true); - assertThat(def0.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isEmpty()); assertEquals(3, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); - assertThat(def1.usages(), contains(use1)); - assertThat(def1.usages(), contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use1)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -143,23 +142,23 @@ public void testReplaceAtUsagesWithPredicateNone() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> false); - assertThat(def1.usages(), isEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -173,25 +172,25 @@ public void testReplaceAtUsagesWithPredicate1() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u == use1); assertEquals(1, def1.getUsageCount()); - assertThat(def1.usages(), contains(use1)); + assertThat(def1.usages(), NodeIterableContains.contains(use1)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(2, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -205,25 +204,25 @@ public void testReplaceAtUsagesWithPredicate2() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u == use2); assertEquals(1, def1.getUsageCount()); - assertThat(def1.usages(), contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(2, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -237,25 +236,25 @@ public void testReplaceAtUsagesWithPredicate0() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u == use0); assertEquals(1, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(2, def0.getUsageCount()); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -269,25 +268,25 @@ public void testReplaceAtUsagesWithPredicate02() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u != use1); assertEquals(1, def0.getUsageCount()); - assertThat(def0.usages(), contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(2, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); - assertThat(def1.usages(), contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -302,27 +301,27 @@ public void testReplaceAtUsagesWithPredicate023() { Use use3 = graph.add(new Use(null, null, def0)); assertEquals(4, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); - assertThat(def0.usages(), contains(use3)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use3)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u != use1); assertEquals(1, def0.getUsageCount()); - assertThat(def0.usages(), contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(3, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); - assertThat(def1.usages(), contains(use2)); - assertThat(def1.usages(), contains(use3)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use3)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -337,27 +336,27 @@ public void testReplaceAtUsagesWithPredicate013() { Use use3 = graph.add(new Use(null, null, def0)); assertEquals(4, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); - assertThat(def0.usages(), contains(use3)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use3)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u != use2); assertEquals(1, def0.getUsageCount()); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(3, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); - assertThat(def1.usages(), contains(use1)); - assertThat(def1.usages(), contains(use3)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use1)); + assertThat(def1.usages(), NodeIterableContains.contains(use3)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -372,27 +371,27 @@ public void testReplaceAtUsagesWithPredicate203() { Use use3 = graph.add(new Use(null, null, def0)); assertEquals(4, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); - assertThat(def0.usages(), contains(use3)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use3)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u == use2); assertEquals(1, def1.getUsageCount()); - assertThat(def1.usages(), contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use3)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use3)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -406,25 +405,25 @@ public void testReplaceAtUsagesWithPredicate01() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u != use2); assertEquals(1, def0.getUsageCount()); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(2, def1.getUsageCount()); - assertThat(def1.usages(), contains(use0)); - assertThat(def1.usages(), contains(use1)); + assertThat(def1.usages(), NodeIterableContains.contains(use0)); + assertThat(def1.usages(), NodeIterableContains.contains(use1)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test @@ -438,25 +437,25 @@ public void testReplaceAtUsagesWithPredicate12() { Use use2 = graph.add(new Use(null, null, def0)); assertEquals(3, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); - assertThat(def0.usages(), contains(use1)); - assertThat(def0.usages(), contains(use2)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use1)); + assertThat(def0.usages(), NodeIterableContains.contains(use2)); - assertThat(def0.usages(), isNotEmpty()); - assertThat(def1.usages(), isEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isEmpty()); def0.replaceAtMatchingUsages(def1, u -> u != use0); assertEquals(1, def0.getUsageCount()); - assertThat(def0.usages(), contains(use0)); + assertThat(def0.usages(), NodeIterableContains.contains(use0)); - assertThat(def0.usages(), isNotEmpty()); + assertThat(def0.usages(), NodeIterableIsEmpty.isNotEmpty()); assertEquals(2, def1.getUsageCount()); - assertThat(def1.usages(), contains(use1)); - assertThat(def1.usages(), contains(use2)); + assertThat(def1.usages(), NodeIterableContains.contains(use1)); + assertThat(def1.usages(), NodeIterableContains.contains(use2)); - assertThat(def1.usages(), isNotEmpty()); + assertThat(def1.usages(), NodeIterableIsEmpty.isNotEmpty()); } @Test diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java index 2ddee19e6c8c..1097cea761d1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/NodeValidationChecksTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; +import jdk.compiler.graal.graph.Graph; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.graph.NodeClass; +import jdk.compiler.graal.nodeinfo.NodeInfo; public class NodeValidationChecksTest extends GraphTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java index c4e31ba33723..07941c7aa5d3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TestNodeInterface.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; public interface TestNodeInterface { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java index eca92e726257..4659148122ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.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 org.junit.Test; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.IterableNodeType; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.options.OptionValues; +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; public class TypedNodeIteratorTest extends GraphTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java index 1429b66f7605..6bf7e29fc3ae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/TypedNodeIteratorTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java @@ -22,21 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test; +package jdk.compiler.graal.graph.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; -import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.IterableNodeType; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; +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; public class TypedNodeIteratorTest2 extends GraphTest { @@ -105,8 +104,8 @@ public void simpleSubclassTest() { graph.add(new NodeB("b")); graph.add(new NodeD("d")); - Assert.assertEquals("bd", TypedNodeIteratorTest.toString(graph.getNodes(NodeB.TYPE))); - Assert.assertEquals("d", TypedNodeIteratorTest.toString(graph.getNodes(NodeD.TYPE))); + assertEquals("bd", TypedNodeIteratorTest.toString(graph.getNodes(NodeB.TYPE))); + assertEquals("d", TypedNodeIteratorTest.toString(graph.getNodes(NodeD.TYPE))); } @Test diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java index ff6ded8016e9..75a5873468ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/GraphOutputTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test.graphio; +package jdk.compiler.graal.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 org.graalvm.graphio.GraphOutput; -import org.graalvm.graphio.GraphStructure; -import org.graalvm.graphio.GraphTypes; +import jdk.compiler.graal.graphio.GraphOutput; +import jdk.compiler.graal.graphio.GraphStructure; +import jdk.compiler.graal.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("org.graalvm.graphio.DefaultGraphTypes"); + Class defaultTypesClass = (Class) Class.forName("jdk.compiler.graal.graphio.DefaultGraphTypes"); Field f = defaultTypesClass.getDeclaredField("DEFAULT"); f.setAccessible(true); GraphTypes types = (GraphTypes) f.get(null); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/GraphSnippetTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/GraphSnippetTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java index 63c298ec753a..2bf132568aa9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/GraphSnippetTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test.graphio; +package jdk.compiler.graal.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("org.graalvm.graphio.GraphSnippets"); + snippets = Class.forName("jdk.compiler.graal.graphio.GraphJavadocSnippets"); } catch (ClassNotFoundException notFound) { Assume.assumeNoException("The snippets class has to be around", notFound); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java index c00f05074bec..7d2aae99a655 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/graphio/NodeEncodingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test.graphio; +package jdk.compiler.graal.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 org.graalvm.graphio.GraphOutput; -import org.graalvm.graphio.GraphStructure; +import jdk.compiler.graal.graphio.GraphOutput; +import jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java index bad232409e6f..b1142213795d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableContains.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test.matchers; +package jdk.compiler.graal.graph.test.matchers; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.graph.iterators.NodeIterable; public class NodeIterableContains extends TypeSafeDiagnosingMatcher> { private T node; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java index 36f4875df6a6..bdea2c5aa0b9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableCount.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test.matchers; +package jdk.compiler.graal.graph.test.matchers; import org.hamcrest.Description; import org.hamcrest.TypeSafeDiagnosingMatcher; -import org.graalvm.compiler.graph.iterators.NodeIterable; +import jdk.compiler.graal.graph.iterators.NodeIterable; public class NodeIterableCount extends TypeSafeDiagnosingMatcher> { private int count; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java index 8fd343eef6d3..95bc8636418a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/graph/test/matchers/NodeIterableIsEmpty.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.test.matchers; +package jdk.compiler.graal.graph.test.matchers; import org.hamcrest.Description; import org.hamcrest.Matcher; import org.hamcrest.TypeSafeDiagnosingMatcher; import org.hamcrest.core.IsNot; -import org.graalvm.compiler.graph.iterators.NodeIterable; +import jdk.compiler.graal.graph.iterators.NodeIterable; public class NodeIterableIsEmpty extends TypeSafeDiagnosingMatcher> { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/aarch64/test/AArch64UncompressPointerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/aarch64/test/AArch64UncompressPointerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java index 9d01b356e29a..ca0b2b08bd19 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/aarch64/test/AArch64UncompressPointerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java @@ -24,16 +24,16 @@ * questions. */ -package org.graalvm.compiler.hotspot.aarch64.test; +package jdk.compiler.graal.hotspot.aarch64.test; +import jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.aarch64.AArch64HotSpotMove; +import jdk.compiler.graal.asm.aarch64.AArch64Assembler; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.hotspot.aarch64.AArch64HotSpotMove; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java index ac04927bcb42..2d62df0abe71 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static jdk.vm.ci.amd64.AMD64.rax; import java.util.Arrays; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.asm.amd64.AMD64Assembler; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java index 8a2e6be9bb3e..68329369aa64 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; -import static org.graalvm.compiler.phases.common.UseTrappingNullChecksPhase.Options.UseTrappingNullChecks; +import static jdk.compiler.graal.phases.common.UseTrappingNullChecksPhase.Options.UseTrappingNullChecks; import static org.junit.Assume.assumeTrue; import java.util.function.Predicate; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.test.MatchRuleTest; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.MemoryConstOp; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer.MemoryMROp; -import org.graalvm.compiler.lir.amd64.AMD64UnaryConsumer.MemoryOp; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java index d649ae4a3992..9870bef98ead 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.vm.ci.hotspot.HotSpotSpeculationLog; import jdk.vm.ci.meta.SpeculationLog; -import org.graalvm.compiler.core.test.GraalCompilerTest; import org.junit.Test; public class ArrayAccessInLoopToAddressTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BinaryMathStubTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BinaryMathStubTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java index c5b170a9d742..797d358432c5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BinaryMathStubTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.api.test.Graal; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiAndn.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiAndn.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java index 6f38df18cc7b..38c726f205ca 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiAndn.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsi.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsi.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java index e6a5db143ca6..c41e0c3cb729 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsi.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsmsk.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsmsk.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java index 550f02996930..bdcd1fe122cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsmsk.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsr.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsr.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java index df86ad89459d..110b4e1b5898 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiBlsr.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import org.junit.Test; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java index 5d0f095aaee4..37d4b192ec19 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/BmiCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java index 590759722e13..48e4db0b48f3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/CompressedNullCheckTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; -import static org.graalvm.compiler.core.common.GraalOptions.OptImplicitNullChecks; +import static jdk.compiler.graal.core.common.GraalOptions.OptImplicitNullChecks; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest; +import jdk.compiler.graal.options.OptionValues; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java index 1a37637c56a7..3dd343b1b4fc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/DataPatchInConstantsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java @@ -23,34 +23,34 @@ * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; - -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.nodes.type.NarrowOopStamp; +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 org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/MathPower0Point5Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/MathPower0Point5Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java index 53b36b580f7a..32fbf398e2e1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/MathPower0Point5Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.api.test.Graal; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/NumberOfTrailingZeroings003.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/NumberOfTrailingZeroings003.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java index 44e6972b1711..698c3c3bb9a1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/NumberOfTrailingZeroings003.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class NumberOfTrailingZeroings003 extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java index 8552d92d07fa..3c69c1fc1770 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; import java.lang.ref.Reference; import java.util.concurrent.atomic.AtomicInteger; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.graph.iterators.NodePredicates; -import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.ReachabilityFenceNode; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java index 2dfb64618da6..f0b904b932af 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/StubAVXTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java @@ -23,43 +23,44 @@ * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; - -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.core.common.type.DataPointerConstant; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.SnippetStub; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.ReplacementsImpl; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider; +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; import org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -241,7 +242,7 @@ public void test() { HotSpotForeignCallLinkage linkage = foreignCalls.registerStubCall(TEST_STUB, HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, COMPUTES_REGISTERS_KILLED); - linkage.setCompiledStub(new TestStub(getInitialOptions(), providers, linkage)); + linkage.setCompiledStub(new TestStub(GraalCompilerTest.getInitialOptions(), providers, linkage)); runTest("testStub"); } } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/UnaryMathStubTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/UnaryMathStubTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java index c1e7be37b269..4d27feba6bee 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/amd64/test/UnaryMathStubTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64.test; +package jdk.compiler.graal.hotspot.amd64.test; import static org.junit.Assume.assumeTrue; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.api.test.Graal; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java index 024f88624613..a1667c51fb5a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/BenchmarkCounterOverflowTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.lir.test; +package jdk.compiler.graal.hotspot.lir.test; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; +import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; import java.io.File; import java.io.IOException; @@ -35,15 +35,17 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; -import org.graalvm.compiler.test.SubprocessUtil; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; @@ -95,7 +97,7 @@ public void incrementCounter() { Object[] args = new Object[]{Integer.MAX_VALUE * 4L}; ResolvedJavaMethod method = getResolvedJavaMethod("test"); - executeActualCheckDeopt(getInitialOptions(), method, EMPTY, null, args); + executeActualCheckDeopt(GraalCompilerTest.getInitialOptions(), method, JTTTest.EMPTY, null, args); } @Test diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java index d2b7844a354d..1583be2e8e75 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/ExceedMaxOopMapStackOffset.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java @@ -22,14 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.lir.test; +package jdk.compiler.graal.hotspot.lir.test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; +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 org.junit.Test; import jdk.vm.ci.code.BailoutException; @@ -90,7 +91,7 @@ public static void instrinsic(LIRTestSpecification spec) { public void testStackObjects() { instrinsic(writeStackObjects); - safepoint(); + GraalCompilerTest.safepoint(); instrinsic(readStackObjects); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java index 82e01dfb5ebf..72b4b8ee3415 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java @@ -22,19 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.lir.test; +package jdk.compiler.graal.hotspot.lir.test; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.jtt.LIRTest; -import org.graalvm.compiler.lir.jtt.LIRTestSpecification; -import org.graalvm.compiler.lir.stackslotalloc.LSStackSlotAllocator; +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 org.junit.Assume; import org.junit.Test; @@ -123,7 +124,7 @@ public static void instrinsic(LIRTestSpecification spec) { public void testStackObjects() { instrinsic(writeStackValues); - safepoint(); + GraalCompilerTest.safepoint(); instrinsic(readStackValues); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/Adler32SubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/Adler32SubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java index 12ff6433aed4..e9a5e2489109 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/Adler32SubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.io.DataInputStream; import java.io.InputStream; import java.nio.ByteBuffer; import java.util.zip.Adler32; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java index 5704a606ce88..1cd8ee7abcee 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ArrayCopyIntrinsificationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.reflect.Array; import java.util.ArrayList; import java.util.HashMap; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.DirectCallTargetNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.LoweredCallTargetNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ArrayNewInstanceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ArrayNewInstanceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java index 17622e343131..d85043194dfc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ArrayNewInstanceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.reflect.Array; import java.util.ArrayList; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/Base64SubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/Base64SubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java index ce9a14f5c3b7..5613e7d5490e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/Base64SubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.common.GraalOptions; +import jdk.compiler.graal.options.OptionValues; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/BigIntegerIntrinsicsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/BigIntegerIntrinsicsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java index 0ab663288fb2..b6ad3b96c2b6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/BigIntegerIntrinsicsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java @@ -23,18 +23,19 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.Pair; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.compiler.graal.hotspot.HotSpotGraalRuntimeProvider; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Assume; import org.junit.Test; @@ -71,7 +72,7 @@ public void testMultiplyToLen() { expectedResults.put(Pair.create(big1, big2), big1.multiply(big2)); } - InstalledCode intrinsic = getCode(getResolvedJavaMethod(BigInteger.class, "multiplyToLen"), null, true, true, getInitialOptions()); + InstalledCode intrinsic = getCode(getResolvedJavaMethod(BigInteger.class, "multiplyToLen"), null, true, true, GraalCompilerTest.getInitialOptions()); for (Pair key : expectedResults.getKeys()) { BigInteger big1 = key.getLeft(); @@ -96,7 +97,7 @@ public void testMulAdd() { expectedResults.put(Pair.create(big1, big2), big1.modPow(bigTwo, big2)); } - InstalledCode intrinsic = getCode(getResolvedJavaMethod(BigInteger.class, "mulAdd"), null, true, true, getInitialOptions()); + InstalledCode intrinsic = getCode(getResolvedJavaMethod(BigInteger.class, "mulAdd"), null, true, true, GraalCompilerTest.getInitialOptions()); for (Pair key : expectedResults.getKeys()) { BigInteger big1 = key.getLeft(); @@ -121,7 +122,7 @@ public void testSquareToLen() { expectedResults.put(Pair.create(big1, big2), big1.modPow(bigTwo, big2)); } - InstalledCode intrinsic = getCode(getResolvedJavaMethod(BigInteger.class, "squareToLen"), null, true, true, getInitialOptions()); + InstalledCode intrinsic = getCode(getResolvedJavaMethod(BigInteger.class, "squareToLen"), null, true, true, GraalCompilerTest.getInitialOptions()); for (Pair key : expectedResults.getKeys()) { BigInteger big1 = key.getLeft(); @@ -297,7 +298,7 @@ private Object invokeSafe(ResolvedJavaMethod method, Object receiver, Object... private static GraalHotSpotVMConfig config = ((HotSpotGraalRuntimeProvider) Graal.getRequiredCapability(RuntimeProvider.class)).getVMConfig(); private static BigInteger bigTwo = BigInteger.valueOf(2); - private static Random rnd = getRandomInstance(); + private static Random rnd = GraalCompilerTest.getRandomInstance(); private static BigInteger randomBig(int i) { return new BigInteger(rnd.nextInt(4096) + i2sz(i), rnd); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/BoxDeoptimizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/BoxDeoptimizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java index 15b5f9cf6f88..f02c90ab1cfa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/BoxDeoptimizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CRC32CSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CRC32CSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java index dcd3de39b83a..b86204601a36 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CRC32CSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.io.DataInputStream; import java.io.InputStream; @@ -32,7 +32,7 @@ import java.nio.ByteBuffer; import java.util.zip.Checksum; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java index 1b87caaf7a07..d8845cef7e27 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CRC32SubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java @@ -22,17 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; - /** * Tests compiled call to {@link CRC32#update(int, int)}. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java index bbd7cff99b10..38cfd5e7a741 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CheckGraalIntrinsics.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.hotspot.HotSpotGraalServices.isIntrinsicAvailable; -import static org.graalvm.compiler.hotspot.HotSpotGraalServices.isIntrinsicSupportedByC2; +import static jdk.compiler.graal.hotspot.HotSpotGraalServices.isIntrinsicAvailable; +import static jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.MapCursor; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.UnimplementedGraalIntrinsics; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Test; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CheckIndexLongTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CheckIndexLongTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java index 15f2a6f9ab7a..2087ff8ab343 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CheckIndexLongTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Objects; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; +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 org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ClassReplacementsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ClassReplacementsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java index 99c31154bc51..e7b7b7dd6338 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ClassReplacementsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; +import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; import org.junit.Test; import java.util.function.Supplier; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java index 8d07394262ae..a94157d8cd56 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ClassSubstitutionsTests.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java @@ -23,26 +23,26 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.reflect.Field; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java index 6c2dfbd1b3b6..41450f657ba5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompilationWrapperTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_FORMAT; -import static org.graalvm.compiler.debug.StandardPathUtilitiesProvider.DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +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 java.io.File; import java.io.IOException; @@ -42,10 +42,11 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.graalvm.compiler.core.GraalCompilerOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -168,7 +169,7 @@ public void testTruffleCompilation1() throws IOException, InterruptedException { "-Dpolyglot.engine.CompilationFailureAction=ExitVM", "-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=all", "-Dgraal.CrashAt=root test1"), - "org.graalvm.compiler.truffle.test.SLTruffleGraalTestSuite", "test"); + SLTruffleGraalTestSuite.class.getName(), "test"); } /** @@ -187,7 +188,7 @@ public void testTruffleCompilation2() throws IOException, InterruptedException { "-Dpolyglot.engine.CompilationFailureAction=ExitVM", "-Dpolyglot.engine.TreatPerformanceWarningsAsErrors=all", "-Dgraal.CrashAt=root test1:PermanentBailout"), - "org.graalvm.compiler.truffle.test.SLTruffleGraalTestSuite", "test"); + SLTruffleGraalTestSuite.class.getName(), "test"); } private static final boolean VERBOSE = Boolean.getBoolean("CompilationWrapperTest.verbose"); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java index 0e2b6e673aa9..19729127fa78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorld.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static java.util.Collections.singletonList; -import static org.graalvm.compiler.core.CompilationWrapper.ExceptionAction.Print; -import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure; -import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationFailureAction; -import static org.graalvm.compiler.core.test.ReflectionOptionDescriptors.extractEntries; -import static org.graalvm.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; -import static org.graalvm.compiler.hotspot.CompilationTask.CompilationTime; -import static org.graalvm.compiler.hotspot.CompilationTask.CompiledAndInstalledBytecodes; -import static org.graalvm.compiler.hotspot.test.CompileTheWorld.Options.DESCRIPTORS; -import static org.graalvm.compiler.hotspot.test.CompileTheWorld.Options.InvalidateInstalledCode; +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 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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.test.ModuleSupport; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.phases.fuzzing.FuzzedSuites; -import org.graalvm.compiler.core.test.ReflectionOptionDescriptors; -import org.graalvm.compiler.debug.GlobalMetrics; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.MethodFilter; -import org.graalvm.compiler.debug.MetricKey; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.hotspot.CompilationTask; -import org.graalvm.compiler.hotspot.CompileTheWorldFuzzedSuitesCompilationTask; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalCompiler; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotFuzzedSuitesProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotLoadedSuitesProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.test.CompileTheWorld.LibGraalParams.OptionsBuffer; -import org.graalvm.compiler.hotspot.test.CompileTheWorld.LibGraalParams.StackTraceBuffer; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; -import org.graalvm.util.OptionsEncoder; +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 com.oracle.truffle.runtime.hotspot.libgraal.LibGraal; import com.oracle.truffle.runtime.hotspot.libgraal.LibGraalIsolate; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java index 350a7b287e64..387e0cb3f839 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompileTheWorldTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure; -import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationFailureAction; +import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationBailoutAsFailure; +import static jdk.compiler.graal.core.GraalCompilerOptions.CompilationFailureAction; -import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.hotspot.HotSpotGraalCompiler; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java index 1c0dea698c12..d1a90c156a3e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/CompressedOopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.ArrayDeque; import java.util.ArrayList; @@ -33,11 +33,10 @@ import java.util.List; import java.util.concurrent.atomic.AtomicReference; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; - import jdk.vm.ci.hotspot.HotSpotInstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java index 12775c4cf069..3343d2a55fd5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DataPatchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java @@ -23,16 +23,16 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.OpaqueValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java index 7613f311663d..5637c3d56b8c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DeferredBarrierAdditionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.gc.G1PostWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1PreWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1ReferentFieldReadBarrier; -import org.graalvm.compiler.nodes.gc.SerialWriteBarrier; -import org.graalvm.compiler.nodes.java.AbstractNewObjectNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.policy.InlineEverythingPolicy; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java index f6fa0d165adc..e75bc80d0979 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/DeoptimizeReasonAccountingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java index 3c6090af844b..0180a3519a7f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ExplicitExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java index 2ac4ed5e3fe1..12dafd4c00fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ForeignCallDeoptimizeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; +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 org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GCStressTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GCStressTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java index 6e448ed945d3..f8037508db1d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GCStressTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.Arrays; import java.util.Collections; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalHotSpotVMConfigAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalHotSpotVMConfigAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java index cf6f85c5d1e2..739822bcd802 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalHotSpotVMConfigAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java @@ -23,14 +23,14 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.function.Supplier; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java index b15d2ef8f08c..f30131e711d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRLockTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.hotspot.phases.OnStackReplacementPhase; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +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 org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java index 5d1a0d5d555b..15b83a5c1fd8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; import java.util.stream.Collectors; import java.util.stream.Stream; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.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 // org.graalvm.compiler.hotspot.test.GraalOSRTestBase$ReturnValue.SUCCESS:org.graalvm.compiler.hotspot.test.GraalOSRTestBase$ReturnValue + 50: getstatic #1 // jdk.compiler.graal.hotspot.test.GraalOSRTestBase$ReturnValue.SUCCESS:jdk.compiler.graal.hotspot.test.GraalOSRTestBase$ReturnValue 53: areturn"""; // @formatter:on diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java index 18c118328146..3bec0bb0a10f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOSRTestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java @@ -23,25 +23,25 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; - -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; -import org.graalvm.compiler.bytecode.BytecodeStream; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.GraalCompilerOptions; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.CompilationTask; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalCompiler; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.java.BciBlockMapping; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; +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; import org.junit.Assert; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOnlyIntrinsicsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOnlyIntrinsicsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java index 67069df1100e..6b5d0f841986 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/GraalOnlyIntrinsicsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.io.IOException; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.SubprocessTest; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Test; import jdk.vm.ci.aarch64.AArch64; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotBase64Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotBase64Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java index d035c75c8506..55d6413444fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotBase64Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static org.junit.Assume.assumeTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotClassInitializationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotClassInitializationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java index 3515209c0d25..d69eca8706c9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotClassInitializationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static org.junit.Assert.assertNotEquals; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java index d765649aba53..e25a2316cc76 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotCryptoSubstitutionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA3_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB; +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 java.io.DataInputStream; import java.io.IOException; @@ -42,17 +42,18 @@ import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.replacements.SnippetSubstitutionNode; -import org.graalvm.compiler.replacements.nodes.AESNode; -import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode; -import org.graalvm.compiler.replacements.nodes.CounterModeAESNode; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA3Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; @@ -340,7 +341,7 @@ private void testDigestBase(String className, String methodName, String algorith private void testDigestBase(MessageDigest digest, byte[] expected, ResolvedJavaMethod method) { StructuredGraph graph = parseForCompile(method); assertTrue(graph.getNodes().filter(SnippetSubstitutionNode.class).isNotEmpty()); - InstalledCode intrinsic = getCode(method, graph, false, true, getInitialOptions()); + InstalledCode intrinsic = getCode(method, graph, false, true, GraalCompilerTest.getInitialOptions()); try { Assert.assertNotNull("missing intrinsic", intrinsic); byte[] actual = digest.digest(input.clone()); @@ -394,7 +395,7 @@ void testWithInstalledIntrinsic(String className, String methodName, String test try { ResolvedJavaMethod method = getResolvedJavaMethod(testSnippetName); Object receiver = method.isStatic() ? null : this; - Result expect = executeExpected(method, receiver, algorithm, data); + GraalCompilerTest.Result expect = executeExpected(method, receiver, algorithm, data); code = compileAndInstallSubstitution(c, methodName); assertTrue("Failed to install " + methodName, code != null); testAgainstExpected(method, expect, receiver, algorithm, data); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotDeoptExplicitExceptions.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotDeoptExplicitExceptions.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java index c5127bc416b9..4bfe7d7301ff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotDeoptExplicitExceptions.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; import java.io.IOException; -import org.graalvm.compiler.core.test.SubprocessTest; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.stubs.CreateExceptionStub; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotDeoptPostExceptions.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotDeoptPostExceptions.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java index 0e83a2c4090f..458508c88ba6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotDeoptPostExceptions.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.meta.HotSpotExceptionDispatchPlugin; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGHASHTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGHASHTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java index d789b0de80d4..fd490c02e09e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGHASHTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Assume; import org.junit.AssumptionViolatedException; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java index 28104d14d91b..1c48814c4b8f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.Cancellable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assume; import org.junit.AssumptionViolatedException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalOptionValuesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalOptionValuesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java index b0396da745ea..019193e656bc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotGraalOptionValuesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintStream; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; +import jdk.compiler.graal.options.OptionValues; +import jdk.compiler.graal.options.OptionsParser; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeJavaMethodTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeJavaMethodTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java index 7f81696fa90e..cf03d518ebd8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotInvokeJavaMethodTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; - -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.TestForeignCalls; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; +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; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotManagedFailedSpeculationListTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotManagedFailedSpeculationListTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java index 94e04414e143..e49309a7680c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotManagedFailedSpeculationListTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java index 5101098ccf85..e6d7a2cfa61c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotMethodSubstitutionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.invoke.ConstantCallSite; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java index 8d018e9ebc4c..c5ed0e8e9443 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotMonitorValueTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java index 42b1b0f3b72b..eb114056466d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotNmethodTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; import jdk.vm.ci.code.InvalidInstalledCodeException; import jdk.vm.ci.hotspot.HotSpotNmethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java similarity index 75% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java index e7829b6771fb..89749f62d7d7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotNodeSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java @@ -22,18 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; import org.junit.Test; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; +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; /** * Tests HotSpot specific substitutions for {@link Node}. @@ -42,7 +43,7 @@ public class HotSpotNodeSubstitutionsTest extends MethodSubstitutionTest { @Test public void test() { - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); DebugContext debug = getDebugContext(options); StructuredGraph graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.YES).build(); test("getNodeClass", ConstantNode.forInt(42, graph)); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotObjectSizeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotObjectSizeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java index 27369dcd9e0f..6ff790b961a7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotObjectSizeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.instrument.Instrumentation; import java.util.ArrayList; import java.util.List; import org.graalvm.collections.Pair; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.test.AddExports; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java index 4ceb5a6fafdd..12f0ee0e37be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotResolvedObjectTypeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.compiler.graal.core.common.type.StampFactory; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStackIntrospectionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStackIntrospectionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java index e81b8b804c3e..8c1e1defea4e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStackIntrospectionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.function.Function; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java index f369e9e16fa7..211632c50ac6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStampMemoryAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStubsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStubsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java index a54388e59f78..a08f66185ab0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotStubsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java @@ -23,20 +23,20 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Map; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.RuntimeCalls; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; +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 org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java index 220ab18183e5..4af29fd70459 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HotSpotUnsafeSubstitutionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java @@ -22,9 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; @@ -51,7 +52,7 @@ public void testSubstitution(String testMethodName, Class holder, String meth // Verify that the generated code and the original produce the same value expected = invokeSafe(originalMethod, receiver, args1); - actual = executeVarargsSafe(code, args2); + actual = GraalCompilerTest.executeVarargsSafe(code, args2); assertDeepEquals(expected, actual); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HsErrLogTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HsErrLogTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java index f230b1981ff4..165d5d25ed16 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/HsErrLogTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; +import static jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +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 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.internal.vm.compiler/org.graalvm.compiler.api.directives=ALL-UNNAMED"); + args.add("--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java index 46ddee0f5e59..9fa11635b47d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/InstalledCodeExecuteHelperTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static java.lang.reflect.Modifier.isStatic; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java index f736ba9bbb15..d77e3d8a3bf2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIInfopointErrorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java @@ -22,38 +22,38 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +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 java.util.function.Consumer; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder; -import org.graalvm.compiler.lir.FullInfopointOp; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIVersionCheckMaxValueTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIVersionCheckMaxValueTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java index 9819332ebb10..3cc0caf9c391 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIVersionCheckMaxValueTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.JVMCIVersionCheck; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.hotspot.JVMCIVersionCheck; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIVersionCheckTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIVersionCheckTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java index 329d4a3292a6..b7d297dc1092 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/JVMCIVersionCheckTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.ArrayList; import java.util.Collection; @@ -32,9 +32,9 @@ import java.util.Properties; import java.util.Random; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.JVMCIVersionCheck; -import org.graalvm.compiler.hotspot.JVMCIVersionCheck.Version; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.hotspot.JVMCIVersionCheck; +import jdk.compiler.graal.hotspot.JVMCIVersionCheck.Version; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java index 5f1161c557a6..69314c839a38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LambdaStableNameTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java @@ -23,25 +23,26 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.math.BigInteger; import java.util.Collections; import jdk.vm.ci.meta.ResolvedJavaType; import jdk.vm.ci.runtime.JVMCI; -import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.hotspot.meta.HotSpotJITClassInitializationPlugin; -import org.graalvm.compiler.java.LambdaUtils; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import org.junit.Test; +import org.objectweb.asm.Type; public class LambdaStableNameTest { private String findStableLambdaName(ResolvedJavaType type) { @@ -66,7 +67,8 @@ public void checkStableLamdaNameForRunnableAndAutoCloseable() { String acName = findStableLambdaName(acType); assertEquals("Both stable lambda names are the same as they reference the same method", name, acName); - assertEquals("The name known in 19.3 version is computed", "Lorg/graalvm/compiler/hotspot/test/LambdaStableNameTest$$Lambda$3b571858be38d19370199ac2c3ec212a511e6f55;", name); + String myName = Type.getInternalName(getClass()); + assertEquals("The name known in 19.3 version is computed", "L" + myName + "$$Lambda$b3eecdea57538cc530ec63a3f2a3564b121557a6;", name); } private static void assertLambdaName(String name) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LibGraalCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LibGraalCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java index 1cbf88e21789..1553ae204ee3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LibGraalCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.hotspot.HotSpotGraalServices; +import jdk.compiler.graal.hotspot.HotSpotGraalServices; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LogNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LogNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java index 90d33890c51f..70d56c74e89c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/LogNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; +import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; import java.io.IOException; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.replacements.nodes.LogNode; -import org.graalvm.compiler.test.SubprocessUtil; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathDoubleFMATest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathDoubleFMATest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java index 67ecc53e0673..c65d57b5d598 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathDoubleFMATest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static org.junit.Assume.assumeTrue; @@ -30,10 +30,10 @@ import java.util.Collection; import java.util.List; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathFMAConstantInputTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathFMAConstantInputTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java index a60de63070bf..e504e7b55bb7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathFMAConstantInputTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public final class MathFMAConstantInputTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathFloatFMATest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathFloatFMATest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java index 112195563a83..dbb4c7584fe4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MathFloatFMATest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static org.junit.Assume.assumeTrue; @@ -30,10 +30,10 @@ import java.util.Collection; import java.util.List; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java index 52936f7ea166..a0d4429d59fe 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/MemoryUsageBenchmark.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java @@ -22,16 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; +import static jdk.compiler.graal.debug.MemUseTrackerKey.getCurrentThreadAllocatedBytes; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.test.AllocSpy; -import org.graalvm.compiler.hotspot.CompilationTask; -import org.graalvm.compiler.hotspot.HotSpotGraalCompiler; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; @@ -44,13 +45,13 @@ * To benchmark: * * 
- *     mx vm -XX:-UseJVMCIClassLoader -cp @org.graalvm.compiler.hotspot.test org.graalvm.compiler.hotspot.test.MemoryUsageBenchmark
+ *     mx vm -XX:-UseJVMCIClassLoader -cp @jdk.compiler.graal.hotspot.test jdk.compiler.graal.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 @org.graalvm.compiler.hotspot.test org.graalvm.compiler.hotspot.test.MemoryUsageBenchmark
+ *     mx vm -XX:-UseJVMCIClassLoader -DCompileTheWorld.Classpath=$HOME/SPECjvm2008/SPECjvm2008.jar -cp @jdk.compiler.graal.hotspot.test jdk.compiler.graal.test.hotspot.compiler.MemoryUsageBenchmark
  *
*/ public class MemoryUsageBenchmark extends HotSpotGraalCompilerTest { @@ -138,7 +139,7 @@ private void doCompilation(String methodName, String label) { int entryBCI = JVMCICompiler.INVOCATION_ENTRY_BCI; HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, entryBCI, jvmciEnv); CompilationTask task = new CompilationTask(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), request, true, false); - task.runCompilation(getInitialOptions()); + task.runCompilation(GraalCompilerTest.getInitialOptions()); } } @@ -155,7 +156,7 @@ private void allocSpyCompilation(String methodName) { HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime(); HotSpotCompilationRequest request = new HotSpotCompilationRequest(method, JVMCICompiler.INVOCATION_ENTRY_BCI, jvmciEnv); HotSpotGraalCompiler compiler = (HotSpotGraalCompiler) runtime.getCompiler(); - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); CompilationTask task = new CompilationTask(runtime, compiler, request, true, false); task.runCompilation(options); } @@ -183,7 +184,7 @@ public void run() { OptionValues harnessOptions = CompileTheWorld.loadHarnessOptions(); if (CompileTheWorld.Options.Classpath.getValue(harnessOptions) != CompileTheWorld.SUN_BOOT_CLASS_PATH) { HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime(); - CompileTheWorld ctw = new CompileTheWorld(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), harnessOptions, getInitialOptions()); + CompileTheWorld ctw = new CompileTheWorld(runtime, (HotSpotGraalCompiler) runtime.getCompiler(), harnessOptions, GraalCompilerTest.getInitialOptions()); try { ctw.compile(); } catch (Throwable e) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java index 2308246a3407..4e07ef3a5f99 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectCloneTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.util.ArrayList; import java.util.Optional; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.hotspot.replacements.ObjectCloneNode; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.virtual.phases.ea.FinalPartialEscapePhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectHashCodeInliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectHashCodeInliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java index 66d2bde5fc51..aabca876bb7c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ObjectHashCodeInliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.memory.ReadNode; +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 org.junit.Test; import jdk.vm.ci.meta.JavaTypeProfile; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java index 6f052a0e0321..0e9c3eb954ec 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/OptionsInFileTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.debug.DebugOptions.Dump; -import static org.graalvm.compiler.debug.DebugOptions.MethodFilter; -import static org.graalvm.compiler.debug.DebugOptions.PrintGraph; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +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 java.io.File; import java.io.FileOutputStream; @@ -36,10 +36,10 @@ import java.io.PrintStream; import java.util.List; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/PolymorphicInliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/PolymorphicInliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java index dd87bc7c7927..1f8494ed355f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/PolymorphicInliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; - -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.AbstractDeoptimizeNode; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.TypeSwitchNode; -import org.graalvm.compiler.test.SubprocessUtil; +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; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ProfileReplayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ProfileReplayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java index d75c4a8659b1..a0d256774553 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ProfileReplayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.io.IOException; import java.nio.file.Paths; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.hotspot.CompilationTask; -import org.graalvm.compiler.hotspot.HotSpotGraalCompiler; -import org.graalvm.compiler.hotspot.ProfileReplaySupport; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/RangeCheckPredicatesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/RangeCheckPredicatesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java index 778f4c718934..055a4059d2a2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/RangeCheckPredicatesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java @@ -24,27 +24,27 @@ * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static jdk.vm.ci.meta.DeoptimizationReason.BoundsCheckException; import static jdk.vm.ci.meta.DeoptimizationReason.LoopLimitCheck; -import static org.graalvm.compiler.core.common.GraalOptions.LoopPredication; -import static org.graalvm.compiler.core.common.GraalOptions.LoopPredicationMainPath; -import static org.graalvm.compiler.core.common.GraalOptions.SpeculativeGuardMovement; +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 java.util.HashSet; import java.util.List; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.loop.phases.LoopPredicationPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.IntegerBelowNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ReferenceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ReferenceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java index 9a33ec1b1a51..e1adf6dce786 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ReferenceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.ref.PhantomReference; import java.lang.ref.ReferenceQueue; import java.lang.ref.WeakReference; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.InvokeNode; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java index f76afe7fea43..f6285f265117 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/ReservedStackAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.io.IOException; import java.util.List; import java.util.concurrent.locks.ReentrantLock; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +import jdk.compiler.graal.test.SubprocessUtil; +import jdk.compiler.graal.test.SubprocessUtil.Subprocess; import org.junit.Assume; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/StringInternConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/StringInternConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java index 4cfc436189c9..b5fe186abd7f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/StringInternConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; +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 org.junit.Test; import jdk.vm.ci.hotspot.HotSpotObjectConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/StringUTF16ToBytesGetCharsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/StringUTF16ToBytesGetCharsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java index 5e03993aaf64..d0bd115c8fef 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/StringUTF16ToBytesGetCharsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java @@ -22,14 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Test; import jdk.vm.ci.code.InstalledCode; @@ -37,7 +39,7 @@ /** * Test substitutions for (innate) methods StringUTF16.toBytes and StringUTF16.getChars provided by - * {@link org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins#registerStringPlugins}. + * {@link HotSpotGraphBuilderPlugins#registerStringPlugins}. */ @AddExports({"java.base/java.lang"}) public final class StringUTF16ToBytesGetCharsTest extends HotSpotGraalCompilerTest { @@ -64,7 +66,7 @@ public void testStringUTF16ToBytes() throws ClassNotFoundException { int srcDelta = Math.min(srcOffset, copiedLength); byte[] dst = (byte[]) invokeSafe(caller, null, src, srcDelta, copiedLength); assert dst.length == copiedLength * 2; - byte[] dst2 = (byte[]) executeVarargsSafe(code, src, srcDelta, copiedLength); + byte[] dst2 = (byte[]) GraalCompilerTest.executeVarargsSafe(code, src, srcDelta, copiedLength); assertDeepEquals(dst, dst2); } } @@ -97,7 +99,7 @@ public void testStringUTF16getChars() throws ClassNotFoundException { int srcDelta = Math.min(srcOffset, copiedLength); invokeSafe(caller, null, src, srcDelta, srcDelta + copiedLength, dst, dstDelta); char[] dst2 = new char[length]; - executeVarargsSafe(code, src, srcDelta, srcDelta + copiedLength, dst2, dstDelta); + GraalCompilerTest.executeVarargsSafe(code, src, srcDelta, srcDelta + copiedLength, dst2, dstDelta); assertDeepEquals(dst, dst2); } } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java index c63c51f6eb72..591e863ebcff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/TestIntrinsicCompiles.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java @@ -22,26 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.core.common.CompilationIdentifier.INVALID_COMPILATION_ID; +import static jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Test; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; @@ -64,7 +65,7 @@ public void test() throws ClassNotFoundException { EconomicMap> invocationPluginsMap = invocationPlugins.getInvocationPlugins(true); HotSpotVMConfigStore store = rt.getVMConfig().getStore(); List intrinsics = store.getIntrinsics(); - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); DebugContext debug = getDebugContext(options); for (VMIntrinsicMethod intrinsic : intrinsics) { InvocationPlugin plugin = CheckGraalIntrinsics.findPlugin(invocationPluginsMap, intrinsic); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/UnsafeNewArrayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/UnsafeNewArrayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java index 1b497239aa56..2af72d60b645 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/UnsafeNewArrayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import java.lang.reflect.Array; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.test.AddExports; import org.junit.Test; import jdk.internal.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/UnsafeWritebackMemoryTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/UnsafeWritebackMemoryTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java index 9181dccea7db..dcf14bd5dc9f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/UnsafeWritebackMemoryTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.replacements.test.MethodSubstitutionTest; +import jdk.compiler.graal.test.AddExports; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/VirtualThreadCarrierThreadTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/VirtualThreadCarrierThreadTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java index c1dfa4e2095e..53832a6bce22 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/VirtualThreadCarrierThreadTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; import static org.junit.Assume.assumeTrue; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.graalvm.compiler.api.test.ModuleSupport; +import jdk.compiler.graal.api.test.ModuleSupport; import org.junit.Test; public class VirtualThreadCarrierThreadTest extends HotSpotGraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/VirtualThreadJFRTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/VirtualThreadJFRTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java index d5eb414e3e85..66cc05bf64d8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/VirtualThreadJFRTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.SubprocessTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.common.GraalOptions; +import jdk.compiler.graal.core.test.SubprocessTest; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.jfr.Event; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java index 6af1ab5b6546..4f4a3a068c68 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/hotspot/test/WriteBarrierAdditionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.test; +package jdk.compiler.graal.hotspot.test; -import static org.graalvm.compiler.core.common.GraalOptions.FullUnroll; -import static org.graalvm.compiler.core.common.GraalOptions.LoopPeeling; -import static org.graalvm.compiler.core.common.GraalOptions.PartialEscapeAnalysis; -import static org.graalvm.compiler.core.common.GraalOptions.PartialUnroll; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.referentOffset; +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 org.junit.Assume.assumeTrue; import java.lang.ref.Reference; @@ -37,28 +37,30 @@ import java.util.ListIterator; import java.util.Objects; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.test.TestPhase; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime.HotSpotGC; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.gc.G1PostWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1PreWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1ReferentFieldReadBarrier; -import org.graalvm.compiler.nodes.gc.SerialWriteBarrier; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -210,8 +212,8 @@ private static MetaAccessProvider getStaticMetaAccess() { /** * The type is known to be WeakReference and the offset is a constant, so the - * {@link org.graalvm.compiler.nodes.extended.RawLoadNode} is converted back into a normal - * LoadFieldNode and the lowering of the field node inserts the proper barrier. + * {@link RawLoadNode} is converted back into a normal LoadFieldNode and the lowering of the + * field node inserts the proper barrier. */ @Test public void testReferenceReferent1() throws Exception { @@ -225,8 +227,8 @@ public Object testReferenceReferentSnippet() { /** * The type is known to be WeakReference and the offset is non-constant, so the lowering of the - * {@link org.graalvm.compiler.nodes.extended.RawLoadNode} doesn't require a barrier even if it - * were the referent field. See JDK-8189871 for a discussion. + * {@link RawLoadNode} doesn't require a barrier even if it were the referent field. See + * JDK-8189871 for a discussion. */ @Test public void testReferenceReferent2() throws Exception { @@ -254,9 +256,8 @@ public Object testReferenceReferent3Snippet() { /** * The type is a super class of WeakReference and the offset is non-constant, so - * canonicalization of the {@link org.graalvm.compiler.nodes.extended.RawLoadNode} will raise - * this to a {@link org.graalvm.compiler.nodes.java.LoadFieldNode} which will have a barrier - * when the node is lowered. + * canonicalization of the {@link RawLoadNode} will raise this to a {@link LoadFieldNode} which + * will have a barrier when the node is lowered. */ @Test public void testReferenceReferent4() throws Exception { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/JTTTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/JTTTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/JTTTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/JTTTest.java index e4786d22f4a8..c9cc1f433004 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/JTTTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/JTTTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt; +package jdk.compiler.graal.jtt; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -36,26 +36,26 @@ import java.util.Optional; import java.util.Set; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.phases.fuzzing.AbstractCompilationPlan; -import org.graalvm.compiler.core.phases.fuzzing.FullFuzzedCompilationPlan; -import org.graalvm.compiler.core.phases.fuzzing.FullFuzzedTierPlan; -import org.graalvm.compiler.core.phases.fuzzing.FuzzedSuites; -import org.graalvm.compiler.core.phases.fuzzing.MinimalFuzzedCompilationPlan; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.core.test.TestPhase; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.runtime.RuntimeProvider; +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 org.junit.Assert; import org.junit.AssumptionViolatedException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java index d81acb216963..0ac6988790cb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/ConstantPhiTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.backend; +package jdk.compiler.graal.jtt.backend; -import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; -import static org.graalvm.compiler.core.common.GraalOptions.MaximumInliningSize; +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 java.lang.reflect.Method; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; public class ConstantPhiTest extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java index c93441eeffa6..0593d00fa699 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/EmptyMethodTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.backend; +package jdk.compiler.graal.jtt.backend; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.jtt.JTTTest; public class EmptyMethodTest extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java index dd8e3c1d8409..a3eb819a2443 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/backend/LargeConstantSectionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.backend; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.api.test.ExportingClassLoader; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.api.test.ExportingClassLoader; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java index 143103802520..de244a470038 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aaload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aaload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java index 4abce5ede1ca..ec877dcad7ca 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aaload_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aaload_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java index 820a33cc5294..2c58804d1fad 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java index 73d453910b1a..da8359b89295 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aload_0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java index 13c93e6fe2c9..b5bcca53c79d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aload_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java index 21f6cd5b5779..3c85430f6da0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aload_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java index 62180a89735b..85b39c863896 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_aload_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_aload_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java index 24449495bb28..7b0e4fb497fe 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_anewarray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_anewarray extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java index 691dc80d7e96..b012f141dd9f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_areturn.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_areturn extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java index e0ccc776ad2f..56532fb15063 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_arraylength.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_arraylength extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java index e9bdfa4c627f..551d6ff5fdcf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_athrow.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_athrow extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java index 5394a2af768b..1a871dee6546 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_baload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_baload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java index ade4b2845bbe..79b53c64c2d6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_bastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_bastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java index dbb07fc2d8b6..6aed927fad68 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_caload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_caload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java index 8a189a1fc615..4dc584c283a2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_castore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_castore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java index e8633f2b6340..9019a2bbcc55 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_checkcast01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java index be59339beed8..e37bd1c8007e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_checkcast02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java index 707e4d6b1087..541254e22664 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_checkcast03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /** * Tests the checkcast works, when casting an array of interface. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java index 0f6738427b87..61901d37ef60 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2f.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_d2f extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java index 3e9b63a2bdfc..77d3c2b30a5f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2i01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_d2i01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java index 14f2a40f4501..531a0f5ec269 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2i02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java @@ -23,12 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_d2i02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java index bda00ba660f8..6f11f931de82 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_d2l01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java index b80bd51f4b97..222beffabe82 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java @@ -23,12 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_d2l02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java index 5013c6caf8c3..716ef12ebda5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_d2l03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java @@ -23,12 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_d2l03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java index 3e5cd4edb22c..eb25241b1836 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dadd.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dadd extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java index 03184810b015..4550310f552b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_daload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_daload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java index 3b39e86e6208..122c4705ee0d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java index 993561336b75..957e5fc09515 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java index 094fe9c99b12..3dcd8fb59c1f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java index 36ea5a4d97c4..2a8f876ffa06 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java index 4eba9d6201e2..d4c42d4cac91 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java index ba7bf46b057d..ad1e92e6e331 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java index dc9a5bab4f91..73e0a8a0fd45 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp06 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java index 4ac463c9e39b..4daf4fe06d20 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp07.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp07 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java index 62e4d97d3dbd..a5b5e9633e5f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp08.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp08 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java index 72bf5959d579..5914e1ed84ad 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp09.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp09 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java index 088509a47b2d..4fa016541394 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dcmp10.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dcmp10 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java index d7dddbdf1106..17630e3916ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ddiv.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java index fe2b059f36d1..2119f0a90cc8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dmul.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dmul extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java index 1e1cffb08356..5b0c439273b6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dneg.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dneg extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java index a16180b488fc..8ae0bebf06e4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dneg2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dneg2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java index fa6a51612dfc..5aa9e83e9a98 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_double_base.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java @@ -23,19 +23,18 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import org.graalvm.compiler.jtt.JTTTest; - @RunWith(Parameterized.class) public abstract class BC_double_base extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java index 1da68d46d659..bae8d3e0d85d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_drem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java index dc3993bfdc53..b0fc1b52f5bf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dreturn.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dreturn extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java index 06aff07b3142..52d0c1569f0a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dsub.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dsub extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java index 463c8ace283c..3aead3f8d192 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_dsub2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_dsub2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java index b2a6f140b80b..f8ea808a4ba4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2d.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_f2d extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java index 1140ff8c7f90..a97d8f905b25 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2i01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_f2i01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java index a1d54529d307..0773cc9beca6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2i02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java @@ -23,12 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_f2i02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java index 46bd14476e5f..1b169a720d38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2l01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_f2l01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java index 46e3a929a438..f04ee7bc6b15 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_f2l02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java @@ -23,12 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_f2l02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java index 8c0113df69c2..d8efd8361f8c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fadd.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fadd extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java index 7f2ff3eb7b42..491892e46ddf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_faload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_faload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java index d3ceff9450c4..a65b2f8268e1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java index e7b3d31bbfd8..afa59ee99b51 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java index b23da29a7756..13401dbb5167 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java index 89358849aa47..e6b8aaf4944f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java index 1c5072a74b06..478e768c4968 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java index da2ccc66774b..9c08f55c1433 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java index a784c8cf0116..7a192c748196 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp06 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java index b3bdc80a376a..03d6cd4ce391 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp07.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp07 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java index 9966b5e2fd82..2994557ce5d4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp08.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp08 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java index db80fceab2fb..e98ea5a42cf1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp09.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp09 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java index 358740dfa1a3..fe9f47efc7ec 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fcmp10.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fcmp10 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java index 26df417850d2..86980cf36bd4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fdiv.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java index d61ece4d8692..4fdbb1a932a2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java index 1497833fb69d..fa3ee6358d90 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fload_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fload_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java index ef8cb5e5ef00..fa0b676a66cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_float_base.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java @@ -23,19 +23,18 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; import java.util.ArrayList; import java.util.Collection; import java.util.List; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; import org.junit.runners.Parameterized.Parameters; -import org.graalvm.compiler.jtt.JTTTest; - @RunWith(Parameterized.class) public abstract class BC_float_base extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java index 2b825858acd5..990e73d00fef 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fmul.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fmul extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java index 67b793835b85..252639cbfeab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fneg.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fneg extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java index c5f3cec33743..1b89518f883f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_frem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java index 7bb426b1350e..ca3a2412d1f7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_freturn.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_freturn extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java index 79b460407ff2..6e91ea40f3e0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_fsub.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_fsub extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java index 4c11ebaae69f..8776a94a4753 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getfield extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java index a64da94fe2cb..22e96020d509 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_b.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_b extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java index bfc8675672ec..9ad2fc811c03 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_c.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_c extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java index ff487d2859fc..49b7f885b118 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_d.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_d extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java index 7ed6f9d35011..aa383936d686 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_f.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_f extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java index c6bd5a2187c2..d843e1b5d7ea 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_i.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_i extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java index 291e0cc759b1..6bc4e1eb6064 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_l.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_l extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java index eaeb91fe6669..1aa28e1f315e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_o.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_o extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java index b54e72bcc733..3b8b300667f5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_s.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_s extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java index a7123fa13ffa..105019c2c800 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getfield_z.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_getfield_z extends JTTTest { static class FieldHolder { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java index 548665b3635d..e053eadc1c41 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_b.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_b extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java index 2f1028dd80c4..46843868b938 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_c.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_c extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java index 668bf3a97b73..53f0968ec2ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_d.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_d extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java index e99d78133f87..765d3dfde08b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_f.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_f extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java index 6b6feaa65f8b..0af77f714eec 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_i.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_i extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java index e2b3a3e6aeca..ecb53b7b5479 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_l.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_l extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java index ab120c712908..3695ac2d9f66 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_s.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_s extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java index 95a06229587f..b2fcaf4921cf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_getstatic_z.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_getstatic_z extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java index b139d3bc004e..f4a19dff71dd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2b.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_i2b extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java index a61c96d85a84..ec2f9e8c9057 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2c.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_i2c extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java index 4f7ede948244..e5214839ec8c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2d.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_i2d extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java index 84d54601e996..3de4204eb52a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2f.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_i2f extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java index 767e675b0cbd..99f9516caa9b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2l.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_i2l extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java index dca2286715d0..79aaa13d6690 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_i2s.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_i2s extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java index abc38cb3f9ef..dd168d9c4a04 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iadd extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java index 3a1d268ddbec..7e45ba43a645 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iadd2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java index c4eea7088e57..e6ce93c6dd9d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iadd3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java index e059c585e58c..6825fd9a6b10 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java index 3e30a93c6ae3..24d6cd6b17ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java index feb798558407..cf15765943e2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java index c79cd2fa4f6e..cd4c5fdfa2b1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iadd_const3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java index b04a7635e681..563b8580ec42 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iaload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iaload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java index f0205b2dad5a..23439181951b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iand.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iand extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java index edc6424fe5d0..8ed37ac7f985 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java index e71fa66fb44b..16363c0ef0f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iconst.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iconst extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java index 30e8c50dda76..bfcc77eb9f4e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_idiv extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java index 3d4a941fe899..bd6330967165 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_idiv2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv_overflow.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv_overflow.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java index 784f72069e66..3c286479eb4a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_idiv_overflow.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_idiv_overflow extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java index 6d8e8af798d8..0fb2ff331919 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifeq extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java index 91a5d3670370..f1827bc98d7b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifeq_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java index 8fef02a2ffe7..409322956f3a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifeq_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifeq_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java index 8051166b29cd..4acbaf40a905 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifge extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java index 2a4d2d1993a8..65363bd6ada4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifge_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java index 0d05ebb16cb4..0f37ddfb494a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifge_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifge_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java index cb45a237e252..e37111612937 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifgt.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifgt extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java index 82bfd1e20663..f97249ddffac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ificmplt1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java index e30af2939911..1ac0a8fdcdc2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmplt2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ificmplt2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java index bb4bd796fac5..9a12ffd02570 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ificmpne1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java index 5820f85ad79b..beb5526babc6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ificmpne2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ificmpne2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java index c90753087385..b164f6e2becb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifle.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifle extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java index cfbcc53466b8..26d12408edb2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iflt.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iflt extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java index a116b87968b7..2048ad940ad5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifne.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifne extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java index e2924df42297..6e2fcb36127e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifnonnull extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java index 5c3451e7fef6..74b0b527cbcb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifnonnull_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java index 1eee1a6af071..a542233b073d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnonnull_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifnonnull_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java index 9a5d918a44b4..bb7e1378c11b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifnull extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java index 04041e50029c..5e8282663d6d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifnull_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java index f8f264244700..64407d3e18ef 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ifnull_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ifnull_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java index 730e2704be36..221734f2f3aa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iinc_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java index 78880f27e465..8410e0af85e3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iinc_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java index 0790e52521cd..9de1fb902eaf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iinc_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java index 2920f694939f..7332e44c835c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iinc_4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iinc_4 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java index 441628a57447..28101b0570cc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java index 67dcba38f5fc..98f022c0ec09 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_0_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java index c3f6376f9ea2..71dbb89f28a3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_0_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_0_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java index e195922c386b..c5d97a5149fc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java index e5059350f0b2..5fd20d8a7de0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_1_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_1_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java index 30a3c3f27f5d..ca6988a4bbff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java index eb28bcf9bb51..7dd0e99bd278 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iload_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iload_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java index 80451451aa6a..a8a1aa9b0226 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_imul.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_imul extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java index a6e5eae3e68d..e71ea3a5eb92 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ineg.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ineg extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java index 1d9a20cb66ff..958dd443c563 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_instanceof extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java index dafa838671fa..fbff1f95b44c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_instanceof01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; +import jdk.compiler.graal.core.phases.HighTier; +import jdk.compiler.graal.options.OptionValues; +import jdk.compiler.graal.phases.tiers.Suites; /** * Tests the instanceof works, when casting an array of interface. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java index 9b291b67293b..34d2a8e1f889 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokeinterface.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_invokeinterface extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java index 414e24ee19c3..9bc689d4f5ba 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_invokespecial extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java index f256d1c39595..d34ea5e2ee96 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokespecial2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_invokespecial2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java index b5b292f564bc..8eee59b486e4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokestatic.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_invokestatic extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java index 44bb51f3f86c..d518c4f1684d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_invokevirtual.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_invokevirtual extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java index 8bdf02606cfb..67cc21b40993 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ior.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ior extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java index 5741c6f12a1a..5a66c454aa0f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_irem extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java index 9b2490b80377..416916ba7f42 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_irem2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java index d1985bb20803..c8c30ddace9e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_irem3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java index bb70fa7da184..fcedf238ab0b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_irem4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_irem4 extends JTTTest { public static int test(int a) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java index bbb76d3c6ff6..ff3dc9f9074a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ireturn.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ireturn extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java index 22816ba06651..0976b91630ea 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ishl.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ishl extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java index 198fd136c233..e227fde59e37 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ishr.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ishr extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java index a31ff0641dae..f4475753f12d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_isub.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_isub extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java index 9e9dacadc630..e1c60017c99d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_iushr.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_iushr extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java index 4e6412bbbdd8..a52404efd4a3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ixor.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ixor extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java index 4ef42eafe806..f6c01b2c22ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2d.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_l2d extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java index 8386a30379de..c0bf8468f910 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2f.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_l2f extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java index 0e1d4665b892..05197f097470 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2i.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BC_l2i extends JTTTest { public static int test(long a) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java index f703e8a3ac8c..2ad730ceea92 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_l2i_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_l2i_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java index 6e68504d14da..1ecbfeee510c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ladd.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ladd extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java index 01809ded4dc8..1c273fb088c4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ladd2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ladd2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java index c3bb4ab40af9..960190335dd8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_laload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_laload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_land.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_land.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java index b97482f68efd..26e37182d504 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_land.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_land extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java index 1e6d32be5b21..bbcd5a1c36f4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java index c2a155393f75..404ddfd7a65c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lcmp.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lcmp extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java index fe6b0614a1cc..a86f1beddd60 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldc_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java index ecaf41ca3828..a6524b0eb39e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldc_02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java index 89dbf83759b6..ab479b004220 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldc_03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java index 22d6b78686b6..06995f84bf86 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldc_04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java index 71d0ff7d3621..b0f28d828756 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldc_05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java index b15962bb156c..a2deb8d81a04 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldc_06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldc_06 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java index 94a5ffef1fc2..e1d483129b89 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldiv extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java index 8d3a6a490a3e..c53f784ac1e8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldiv2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java index bf89f2b31ed3..48bddbcb2e0e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldiv3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv_overflow.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv_overflow.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java index 95a650b7b413..9734a944eb88 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_ldiv_overflow.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldiv_overflow extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java index 5a08be37b23d..8afc9e15580e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lload_0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java index b994bdf1fcc1..89c3ba53d074 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ @SuppressWarnings("unused") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java index b8d7007a23ce..2b4546b46c63 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lload_1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java index 5429a106a0d8..41fd864b581c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lload_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java index 5940c0567287..600e909b2eab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lload_3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java @@ -25,12 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lload_3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java index 3d748b4650d1..6a351bd6a1d7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lmul.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lmul extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java index 543ce0762ac3..42c7bb53bda2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lneg.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lneg extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java index 82fde6f34375..2e0376410021 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lookupswitch01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java index 971a422fdb28..04b622631a58 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lookupswitch02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java index d84eff346d1e..52a5c68c39de 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lookupswitch03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java index a4b78b9dcf70..ce0ba4bc310f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lookupswitch04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java index cca1c8f3bc12..bbd7bfb2d0df 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lookupswitch05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lookupswitch05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java index 31678cad6367..9d09220bbd52 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lor.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lor extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java index e57abced4022..0cd59886ed03 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lrem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lrem extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java index fc90ceed883b..4f515a3e60a6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lrem2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lrem2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java index ef959038c96e..2facb25e93e5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lreturn.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lreturn extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java index 860a739ab17c..ac4acb8d985c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshl.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lshl extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java index bcc82f147f69..fb81995d2b0f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshr.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lshr extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java index ee80a7c29d04..04007020801b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lshr02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lshr02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java index a2292c8402d1..677a8606ef99 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lsub.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lsub extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java index 9c57f3876507..644ae92f554e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lushr.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lushr extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java index 859718ab43b5..7592154085dd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_lxor.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lxor extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java index 07983a31fe25..49fc7fc2db5a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_monitorenter extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java index 988ed523fcd0..367861f0af39 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_monitorenter02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_monitorenter02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java index 1aed5a78eb89..c14885bd26ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_multianewarray01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java index e60cd0555796..77c90a4d4660 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_multianewarray02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java index f8ff820f64d3..eff78355216f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_multianewarray03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java index 256418e4a97b..182a879b3390 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_multianewarray04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_multianewarray04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_new.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_new.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java index b934f719deea..1b3551f26f2b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_new.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_new extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java index 955742b693f6..0617b4b418b2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_newarray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_newarray extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java index fd78d4aa62ad..177dda291eed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_newarray_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class BC_newarray_02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java index 7c8c0cdf8a75..575109f04e0b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_putfield_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java index 63d6f7160c33..7b48457d73ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_putfield_02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java index c230552cbed6..7d0db421c72c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_putfield_03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java index 32d4e7b054e8..9e6811674f0f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putfield_04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_putfield_04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java index 4f7834819799..532463068937 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_putstatic.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_putstatic extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java index 022d06ad246a..4323160f0ecf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_saload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_saload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java index fe12023e3bd4..42a7abdcb626 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_sastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_sastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java index 7fc34892fcba..4d5c90ac0da1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_tableswitch extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java index a46bfe8ead9d..5c52325f0165 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_tableswitch2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java index 936530a85501..1aa8ada9cd95 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_tableswitch3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java index 5c2e96aadebd..ee8f370dda38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_tableswitch4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_tableswitch4 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java index 8132df388b55..8d44f2d5367d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_wide01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_wide01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java index 61d0698dd431..11fd11676a1d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/bytecode/BC_wide02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.bytecode; +package jdk.compiler.graal.jtt.bytecode; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_wide02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aaload0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aaload0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java index e7b34c642af8..ff167f815510 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aaload0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_aaload0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aaload1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aaload1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java index a455dd98a656..b3c774164edf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aaload1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aastore0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aastore0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java index 0afb8bb7757a..f2ad83ad904e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aastore0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_aastore0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aastore1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aastore1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java index 39fd4e20a2a0..cb30bc451b4f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_aastore1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_anewarray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_anewarray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java index 230a1a10b76b..eb79e0c270c4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_anewarray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_arraylength.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_arraylength.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java index db0249ebd916..7f8ca896a630 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_arraylength.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_arraylength extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java index f645e927bbf8..a153b1045ed7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_athrow0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java index ce8cb3e146f0..f998aa92efa5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java index 588428dcf550..ad836a5109dd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_athrow2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java index d34361ce5002..ba2084ac2aa9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_athrow3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_athrow3 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_baload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_baload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_baload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_baload.java index 004b8b2b802b..7c5600b9d8ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_baload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_baload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_baload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_bastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_bastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java index f3063f465ab4..d4700553bd36 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_bastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_bastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_caload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_caload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_caload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_caload.java index 65e2a4ee5dd8..d6ebf6121a55 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_caload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_caload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_caload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_castore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_castore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_castore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_castore.java index 186c0a302ed4..96b667bd39ee 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_castore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_castore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_castore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java index 8c4bca441cac..98d72a8733d1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java index 8144b20aa3ce..247ad95c5287 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java index abcfeafeb704..c21729c53789 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java index ce1e4fabe674..4a401ca07929 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast3.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java index bb3ec5638107..8cdec22dab2d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java index 68ca66a05b22..5b6e250cc7db 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast5.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java index faefd3b78894..bef7113064fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_checkcast6.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_daload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_daload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_daload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_daload.java index 0a56d6050888..fb4c1d34ed5e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_daload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_daload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_daload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_dastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_dastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java index 75b9d2bbf740..1ede9272d0d7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_dastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_dastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_faload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_faload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_faload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_faload.java index 444e7af75290..6ed39a9b61c2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_faload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_faload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_faload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_fastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_fastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java index 052d54feb456..314d824c1a20 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_fastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_fastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_getfield.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_getfield.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java index 006ad4334fc8..3fad93733ce1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_getfield.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_getfield extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_getfield1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_getfield1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java index 528d385fa8d6..899b82bcbcc8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_getfield1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java @@ -24,10 +24,10 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.phases.OptimisticOptimizations; import org.junit.Test; public class BC_getfield1 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_iaload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_iaload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java index ea6cfecdeaef..b46dfa306924 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_iaload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_iaload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_iastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_iastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java index b5cb7394cbb6..d771a66d02ad 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_iastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_iastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_idiv.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_idiv.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java index a70eb2754759..82c13ec33761 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_idiv.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java @@ -25,11 +25,11 @@ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_idiv extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_idiv2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_idiv2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java index a7ef9230e4a3..a42142938535 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_idiv2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java @@ -25,11 +25,11 @@ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_idiv2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java index e3a5b9c88187..c7feae86a07a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokespecial01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java index 4d450b35cc19..63ebc00bea51 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokevirtual01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java index e1ace16ece50..4cdb13396f5a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_invokevirtual02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_irem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_irem.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_irem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_irem.java index 9a0e8c82d0b9..e3e6a911b214 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_irem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_irem.java @@ -25,11 +25,11 @@ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_irem extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_laload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_laload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_laload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_laload.java index 7a5920d836e3..cc484a874225 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_laload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_laload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_laload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_lastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_lastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java index 3b4d22b90102..8db32700c402 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_lastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_lastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_ldiv.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_ldiv.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java index 4f3b30a68793..f816fbd79f48 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_ldiv.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java @@ -25,11 +25,11 @@ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_ldiv extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java index 11b74bd28273..fbd900b40ec1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_ldiv2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java @@ -25,11 +25,11 @@ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_ldiv2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_lrem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_lrem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java index fdda8cbd5974..cfc8cc03bb13 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_lrem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java @@ -25,11 +25,11 @@ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_lrem extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java index f6e56658e953..2aa73925c25f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_monitorenter.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java index 608e06488f12..6cec1c379915 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_multianewarray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_newarray.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_newarray.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java index 21e69ab7013d..ad43cb35bbfa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_newarray.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_putfield.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_putfield.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java index b4104e52dc4a..a319353c1750 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_putfield.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_putfield extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_saload.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_saload.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_saload.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_saload.java index e043c017650d..b2ebd85d28cc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_saload.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_saload.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_saload extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_sastore.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_sastore.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java index 1bb3e5907403..77ab2abf163f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/BC_sastore.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BC_sastore extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java index afae11d37a09..6e53c9615094 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java index aec80d67c258..67fa4157e456 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java index aaefcfd2c43e..006348f85238 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Loop03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java index c8287c5dd479..b01752fc5697 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NASE_1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java index 9b27dbbc69b6..3f4becf34a02 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NASE_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java index 168cb40cb249..2be6345a5b4d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_00.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java index f93a10767a8a..2afb047c70ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java index e2ca2c7ecd9a..565f23669a05 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java index 9d855a59e86c..11586caa833f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java index ce4856b3e338..ca84de990465 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java index 1a5bee1b1575..39ff2776d2a3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java index 33619ba57e15..ab4997e10994 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java index b1d4afc7f093..ddb336aac5ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_07.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java index bd974a17390d..2cd8607b47ee 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_08.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java index ce9777bdc161..fdf590ded8e0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_09.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java index 016255c1ec01..8dd36c70bc13 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_10.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java index 1a70526d62e5..6c901b678071 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_NPE_11.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java index 45be87ee394c..f2b5de216353 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java index f0938a818ea8..2de701b21fa9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java index b9ded787c6e6..b7325d614fd9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_StackOverflowError_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /** * Some basic checking of the stack trace produced after a StackOverflowError. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java index c93f6ca09d18..1d2ed33208f3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java index 2c3926d72a6f..e7b9db37aed4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java index 19c38b1ab537..6b60d8976c83 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Two03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java index fdf8df9d39a3..a03e5dce0c61 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java index 9f3cc07da5d9..1cb5d069425f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java index 846a888dfe7d..594252dd999d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java index 58b0b12d251c..980f083147d4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Catch_Unresolved03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Locals.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Locals.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java index 50ddfd0d25e9..93bffb5988b4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Locals.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Except_Locals extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java index 61ee6a24ae53..fddaf992f4c6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java index d229ec326f18..836355e1c5d5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Except_Synchronized02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java index 29d3933cca09..ac47b5a77f78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java index c9ef89829aa6..9e622c7775f6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Except_Synchronized04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java index 30ae2dce74b6..26aa7eeb6b70 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Except_Synchronized05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Except_Synchronized05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Finally01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Finally01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally01.java index 581c87f8d5ae..0f69cee2279f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Finally01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Finally02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Finally02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally02.java index ca90d7ffa6bb..0a5090e860fa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Finally02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java index 7d0cc5db8c47..41e343835861 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_AIOOBE_00.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java index 54d81e0900ae..7f97cfa5d60d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_CCE_00.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java index a1f7ed304389..8f47a472a046 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_00.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java index 0eb9c6a03fd0..15fb9f9e4ae2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java index fe43676fe73c..7ce0f9a60502 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java index 68930086a2ac..1aabd1b002ea 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/StackTrace_NPE_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java index 5605753948eb..c14e6023dccf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_InCatch01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java index c9f17c111d78..f6a1d436e025 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_InCatch02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java index 68d911d8fe9b..3e0658d3ea68 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InCatch03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_InCatch03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InNested.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InNested.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java index c24c441b0f79..37e6c4f1ae8e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_InNested.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_InNested extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java index 4047fe70aab1..4366ece05d8b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_NPE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_NPE_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java index cac9f54dabc8..688267e095d3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_Synchronized01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java index 0bd603ac54c5..3d323abe9e7e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_Synchronized02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java index 65dbe75fb15a..6bca2ce6c96d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_Synchronized03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java index 926d21d484e3..21aa3bbcc53e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_Synchronized04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java index e27cc0ba13df..563dd6dc45ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/Throw_Synchronized05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Throw_Synchronized05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java index 8e2b22182b3b..47b318ae2508 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/except/UntrustedInterfaces.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.except; +package jdk.compiler.graal.jtt.except; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.api.test.ExportingClassLoader; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.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 = "org.graalvm.compiler.jtt.except.PoisonPill"; + public static final String POISON_IMPL_NAME = "jdk.compiler.graal.jtt.except.PoisonPill"; @Override protected Class findClass(String name) throws ClassNotFoundException { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java index 7a287c717d85..144fc6bf6fd2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java index 1271a90517ec..3cd69e85fe6a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_allocate02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java index 41ab8a0ba1e6..8f6633fe317c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java index 2e2d6342f1d0..82667345605e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_allocate04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_allocate04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java index 024445782273..ea2d62f9a3f4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java index 3e96cf2c70a6..b3d893d323a9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_array02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java index 4d6a3624035a..b345bfe1a027 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java index 60b8e395c525..5f31f4cdc68c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_array04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_array04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java index e52a78f37c2a..f448460922de 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_control01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_control01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java index 43539c2ad66a..60219f0f2059 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_control02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java index 2dff672ae983..c54aefb39dd7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_convert01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_convert01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_count.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_count.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java index cc642e7eaabb..2465ce0df76b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_count.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Runs: 10 = 55; 20 = 210; 30 = 465; 40 = 820; */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java index ad51b33b3f4f..95153cc4ff37 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_dead01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_dead01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java index fcf81f5d1394..4d1c2edbe50f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_demo01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_demo01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java index 3cfbc1e19a1c..054605865021 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java @@ -23,13 +23,13 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java index 2d9bdd1ee385..d27e050d82c2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Runs: 10 = 55; 20 = 210; 30 = 465; 40 = 820; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java index 6d92652dcfd2..0a9bfce8ea24 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java @@ -23,14 +23,13 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_field03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java index 2b2b7adf9565..d9dd7a32f1ff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_field04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_field04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java index 18656f74bdb0..f0bfe244f4cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_idea.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java @@ -24,14 +24,13 @@ */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import java.util.Random; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class HP_idea extends JTTTest { public boolean test() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java index 117acf0b137a..08b3c3f721c7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_inline01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_inline01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java index 8ff5744ac677..001df2b156c8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_inline02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java index 2eb6d12258ee..8c370366c1d7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_invoke01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java @@ -24,12 +24,11 @@ */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_invoke01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_life.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_life.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java index d488d1167aef..944c724e09e3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_life.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java @@ -23,13 +23,13 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import java.util.Random; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java index 8a44b11bdbe3..27cee059356e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_nest01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java index f2e6bacaf1be..68ac04009f05 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_nest02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_nest02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java index f18f5402b66b..8600b685ea88 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_scope01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java @@ -23,13 +23,12 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Ignore; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_scope01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java index 3634d35eb85c..53ec41d91ea6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_scope02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_series.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_series.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java index 4628343ddac9..ed3b9f30d9f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_series.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java @@ -24,9 +24,9 @@ */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java index b6a995f885b9..34c971e48d91 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotpath/HP_trees01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java @@ -23,12 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.hotpath; +package jdk.compiler.graal.jtt.hotpath; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class HP_trees01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java index b8a5c119b39a..76cf7cc1cebd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6186134.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; import java.util.ArrayList; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - // @formatter:off public class Test6186134 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java index 72644ad1339c..af805f00d663 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6196102.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /** * Integer seems to be greater than {@link Integer#MAX_VALUE}. * diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java index f874ffcb42a9..c45f5142073b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6753639.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /** * Strange optimisation in for loop with cyclic integer condition. * diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java index f63e54e7e6bd..b012ce0f3367 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6823354.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; import java.net.URLClassLoader; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java index 9fe814128306..76442601d23e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6850611.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - //@formatter:off /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java index 53c7134274b3..42e0a9ef53ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test6959129.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java index 898b67dbd625..9030ffd10c39 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/hotspot/Test7005594.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.hotspot; +package jdk.compiler.graal.jtt.hotspot; //@formatter:off diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java index d11850798c4c..48a78b09c1a4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/CharacterBits.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class CharacterBits extends JTTTest { @SuppressWarnings("unused") private static char init = Character.reverseBytes((char) 42); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Class_getName.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Class_getName.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java index 9aff471afccc..ab8485546562 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Class_getName.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java index 296c324ce2f1..2d3f86df1abd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/DivideUnsigned.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class DivideUnsigned extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java index 133222a49a83..5445c331d248 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/EnumMap01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import java.util.EnumMap; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java index 20bc1adff813..66cfa8ddc527 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/EnumMap02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import java.util.EnumMap; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java index c92917a5258e..60a974120bab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/IntegerBits.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class IntegerBits extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/IntegerShuffleBitsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/IntegerShuffleBitsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java index 17431c365e53..9eae411257f8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/IntegerShuffleBitsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import static org.junit.Assume.assumeTrue; @@ -30,9 +30,9 @@ import java.util.Collection; import java.util.List; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.api.test.Graal; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/LongBits.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/LongBits.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java index 9e007eb9b26c..b276feaabc42 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/LongBits.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class LongBits extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/LongShuffleBitsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/LongShuffleBitsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java index 612b2a711dd5..c567671bbe72 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/LongShuffleBitsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import static org.junit.Assume.assumeTrue; @@ -30,9 +30,9 @@ import java.util.Collection; import java.util.List; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.api.test.Graal; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/ShortBits.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/ShortBits.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java index 8d61d6e2c004..5a78c8081397 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/ShortBits.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class ShortBits extends JTTTest { @SuppressWarnings("unused") private static short init = Short.reverseBytes((short) 42); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java index 68cff2983678..83e962226cc5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java index 7f5148dda71a..b5b5c89da56a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_currentTimeMillis02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java index a539cf5769dd..658f7f8efa5a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_nanoTime01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java index c77370aed708..43a5cca1a689 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_nanoTime02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_setOut.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_setOut.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java index 3b4e0067ffe0..06764da7c7be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/System_setOut.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import java.io.ByteArrayOutputStream; import java.io.PrintStream; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java index 27bee7685818..50b0561edac7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Thread_setName.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java index 6863e558cda1..a4d54ff9c111 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/UnsafeAccess01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import java.lang.reflect.Field; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java index 45dbbae93692..9d49f985faea 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/UnsafeAllocateInstance01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; import java.util.AbstractList; import java.util.List; @@ -30,7 +30,7 @@ import org.junit.Ignore; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java index 3eeac974509a..bfb57a82d164 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwap.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java index df3ae0513f08..224a0e666a05 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/jdk/Unsafe_compareAndSwapNullCheck.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.jdk; +package jdk.compiler.graal.jtt.jdk; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.phases.OptimisticOptimizations; import org.junit.Test; public class Unsafe_compareAndSwapNullCheck extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java index 4d9e70ab441a..1df84e5d81fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Boxed_TYPE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java index 356a2fa16e2a..8652a3be7bf9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Bridge_method01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/CheckedListTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/CheckedListTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java index afd1f81fdd79..ced7935a92ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/CheckedListTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java index 27516fcb439d..0223ed4ebda0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/ClassLoader_loadClass01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.net.URL; import java.net.URLClassLoader; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java index 476c84bb2c9b..c6273301309f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_Literal01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_Literal01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java index 86b90f74c143..3cde271f3bbb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_asSubclass01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_asSubclass01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_cast01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_cast01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java index adee83e34b4b..248c8efadcc3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_cast01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public final class Class_cast01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_cast02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_cast02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java index b6ddc6404b96..50ff34a4b1d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_cast02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_cast02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java index a3dd7299c7fc..19a4365cda78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.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("org.graalvm.compiler.jtt.lang.Class_forName01").toString(); + return Class.forName("jdk.compiler.graal.jtt.lang.Class_forName01").toString(); } if (i == 3) { return Class.forName("xyxzz.xyzyzyz.XXYYY").toString(); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java index bfbc1d04f7c8..a614a2b2ccaa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.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 = "org.graalvm.compiler.jtt.lang.Class_forName02"; + clname = "jdk.compiler.graal.lang.jtt.compiler.Class_forName02"; cl = Class_forName02.class; } else if (i == 3) { clname = "xyzz.zyxy.XYXY"; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java index ac556969d3a5..a5fc8ae2591f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.net.URL; import java.net.URLClassLoader; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java index a0b7ec8b3f6f..9bb21fede8a9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java index 4c00cbf4668f..beaf34a4cbf6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_forName05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.net.URL; import java.net.URLClassLoader; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java index 54ab1240f214..ffe19dbf240a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getComponentType01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getComponentType01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java index 7aea5f960f89..6b44972b967a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getInterfaces01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java index ebd3790a9455..11345587fab2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getModifiers01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.io.Serializable; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getModifiers01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java index 933d455ce2d1..9eb46ad3fbab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getModifiers02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getModifiers02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getName01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getName01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java index 2b47ef8e2e6b..4f5d8d46330f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getName01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getName01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getName02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getName02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java index 1c964c845d9f..d743bfaef89f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getName02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getName02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java index 399aa1077ee5..82244573f307 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java @@ -27,11 +27,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getSimpleName01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java index 1ee6a45b1e1d..a9c5167e5bc4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSimpleName02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java @@ -27,11 +27,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getSimpleName02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java index ae5bce7bc7e6..0112865712ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_getSuperClass01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_getSuperClass01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java index 1f0dd53cc6b5..e73b6d20a2fa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isArray01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isArray01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java index f8a20a9a5c74..2a38d6b55122 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isAssignableFrom01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java index 2b4b3e2b9e3b..82900b740a18 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isAssignableFrom02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java index 98e4f83214e6..088399c51268 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isAssignableFrom03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isAssignableFrom03 extends JTTTest implements Cloneable { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java index 785a5d691d92..7cb93264ca0c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java index 90ee066c3c2a..fff5d42a6ad8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java index 30aa78e25435..d34475945d43 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java index 2fbe4b631141..a158f75f6113 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java index cd1a3ae6a02a..1907b8cb33ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java index e769878d81ff..ae5f02337c52 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance06 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java index 6abde1e15f28..557ff18f38b7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInstance07.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInstance07 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java index a16dbb44d6e6..be46fd392065 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isInterface01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isInterface01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java index 165ebd835a29..8d91af335d3c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Class_isPrimitive01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Class_isPrimitive01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_01.java index 2d65fbcc8f26..b98789524fe7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_conditional.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_conditional.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java index 62e74ada1abf..1f5634c2a143 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_conditional.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.bytecode.BC_double_base; +import jdk.compiler.graal.jtt.bytecode.BC_double_base; public final class Double_conditional extends BC_double_base { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_isInfinite.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_isInfinite.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java index 033a168a7591..ea5ef23931f6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_isInfinite.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class Double_isInfinite extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_toString.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_toString.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java index fb1ef5fd0c1e..d12c134e3231 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Double_toString.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_01.java index da155a0be278..c6a9a2e16c59 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Float_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_02.java index f4a512b291f4..46af87dbc688 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_03.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_03.java index 2d3d6609f533..c9a0348dd4c4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_conditional.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_conditional.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java index 42fa1faea1f8..a17c85a33d3d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_conditional.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.bytecode.BC_float_base; +import jdk.compiler.graal.jtt.bytecode.BC_float_base; public final class Float_conditional extends BC_float_base { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_isInfinite.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_isInfinite.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java index c6c1d9f3a2e8..abca261b2869 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Float_isInfinite.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class Float_isInfinite extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java index 699a00226f04..851993036835 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_greater01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java index fb37d5773846..59db41c043ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_greater02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java index 7d2bff5131d9..87dd161d94f0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greater03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_greater03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java index 1e4de911b6fa..7a530702c024 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_greaterEqual01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java index 44fb1c893034..0574bb829301 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_greaterEqual02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java index 508d926fb10d..afe265ba3146 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_greaterEqual03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_greaterEqual03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java index 0a1fd7420558..3c052b6b2d45 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_less01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java index a2ac62d621ca..1549423c9ace 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_less02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java index 17438683976e..7ddac14c3b33 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_less03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_less03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java index 33bc4da5dedb..fde87a9d8386 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_lessEqual01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java index 329afcbbe667..f32cc1082004 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_lessEqual02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java index 1846fe3c15d1..66c53833c213 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_lessEqual03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Int_lessEqual03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_reverseBits.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_reverseBits.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java index 81f14ccc6961..9eaaf63aff2e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Int_reverseBits.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class Int_reverseBits extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java index 0b97abab02d0..4a78d99c9ac5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java index 670baf58ef8c..6117b44ad81c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/JDK_ClassLoaders02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.net.URLClassLoader; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java index 28117366cf9a..50219b5264f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/LambdaEagerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import static org.graalvm.compiler.core.common.GraalOptions.InlineEverything; +import static jdk.compiler.graal.core.common.GraalOptions.InlineEverything; import java.util.EnumSet; import java.util.function.IntBinaryOperator; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java index 6a877a86c749..7c614334a74b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java index acf83ee118cf..de5dedd1aa56 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_greater02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java index c3b62f85c479..461ccfba8f73 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greater03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_greater03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java index a2c732cc8fb3..0acf9545de88 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_greaterEqual01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java index 2b786e704ffd..43f7ae574214 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_greaterEqual02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java index 45fd8c5ccd92..c3a9e2be0640 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_greaterEqual03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_greaterEqual03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java index b8632deede5e..bdef3dd0d5e7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_less01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java index ff699a594c22..f0f2bda6fa5b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_less02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java index 1f6e0c46d5c1..321ec13bc3b7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_less03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_less03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java index e8b9202e25e2..95b6dacf8b04 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_lessEqual01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java index 8042edf8fb76..1c3ea05533b2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_lessEqual02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java index e77d64fb03a6..f29db6e3089f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_lessEqual03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Long_lessEqual03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBits.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBits.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java index 304f2f4d84ec..849cf8c94bdf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBits.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class Long_reverseBits extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java index e1e231d80075..9aca8e562629 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java index 0ff625bb9c1d..8ddbe5c00680 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Long_reverseBytes02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_abs.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_abs.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java index 783680ece08f..4c5d6df511b4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_abs.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_copySign.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_copySign.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java index 865f7af2669e..4fe6a0f1c5a2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_copySign.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class Math_copySign extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_cos.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_cos.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java index ec590e256800..f0022f8c5739 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_cos.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_exact.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_exact.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java index a99a070525e5..50a33716c626 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_exact.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_exp.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_exp.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java index 06b00a0a1d5a..16d68633c126 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_exp.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_log.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_log.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log.java index 3f4055af0097..c68138f53b8b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_log.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_log10.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_log10.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java index e6d676ed16e6..3fa1c4c11a95 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_log10.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.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 org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_minMax.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_minMax.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java index 6242268a3f30..27bb78fde411 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_minMax.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java @@ -23,13 +23,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_pow.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_pow.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java index cf92ef5aba80..4fe094ca1774 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_pow.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_round.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_round.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_round.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_round.java index acec022402aa..bfe51b57b543 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_round.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_round.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.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 org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; @RunWith(Parameterized.class) public class Math_round extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_signum.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_signum.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java index d36d2a731cb9..f3788ba62cb1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_signum.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class Math_signum extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_sin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_sin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java index 6480f5dd1d6b..9855279fe0af 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_sin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java index d6069afbe133..b653437f3baf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_sqrt.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_tan.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_tan.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java index cc17b36339c3..8afd4237462b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Math_tan.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_clone01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_clone01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java index c3fa79bcc1d3..6b5741b803b4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_clone01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Object_clone01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_clone02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_clone02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java index b82ccca24ecf..56b1b7fb2c38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_clone02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Object_clone02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_equals01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_equals01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java index 3a0b3782f9a6..13b4bb96bc0a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_equals01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_equals01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java index 19cfae8b4050..695c6d29eade 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_getClass01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_getClass01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java index e0f36271995d..5c6627089b18 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_hashCode01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_hashCode01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java index 7f8b508dabbd..c2ebc172fff2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_hashCode02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java @@ -24,14 +24,14 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.time.DayOfWeek; import java.util.HashMap; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_hashCode02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notify01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notify01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java index e78fe322c8e5..5961c5dcffac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notify01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_notify01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notify02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notify02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java index 4ae04ab8f220..54f3dad61781 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notify02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_notify02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java index 3fa966cf3682..726359997691 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notifyAll01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_notifyAll01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java index e5a8003d79f3..c267ad91115b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_notifyAll02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_notifyAll02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_toString01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_toString01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java index 20931ef34dc8..57cc6415c5b4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_toString01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Object_toString01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_toString02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_toString02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java index 33887bc8e857..fbbdb322268f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_toString02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java @@ -27,11 +27,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Object_toString02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java index b2f09957f057..369ac17982c0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_wait01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java index eb6af33d971c..f8ee6a88edbd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_wait02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java index 0e2c685f0e5b..528a4498375d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/Object_wait03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class Object_wait03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java index 6d94403d48ba..b5f9080c91fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/ProcessEnvironment_init.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java @@ -24,7 +24,7 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import java.util.Collections; import java.util.HashMap; @@ -32,7 +32,7 @@ import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public final class ProcessEnvironment_init extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java index d812aa21ac68..54514b9b01be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/StringCoding_Scale.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class StringCoding_Scale extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java index f77912290a1b..3e21a4c3de48 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java index 70b792637ec5..7964f861ffab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java index 3fa17d51fef0..416f98df7ae0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_intern03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java index bc7e7b7346c0..15f80395aa0b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/String_valueOf01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java index cae4ce369128..773a4d9318b1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/System_identityHashCode01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/UnaryMath.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/UnaryMath.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java index 35ca0986f2a0..0edfc464c053 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/lang/UnaryMath.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.lang; +package jdk.compiler.graal.jtt.lang; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.options.OptionValues; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java index 125d3c68476a..7dad848dbf2a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/DegeneratedLoop.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop01.java index 724df6b38bd1..817f994fa107 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop02.java index d94aab21d599..bb2259acf677 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop03.java index 82f2115000fd..34cfe3823372 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop04.java index bf1e56e25d1d..8d553a90f701 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop05.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop05.java index 8cee3b2b6047..2e5518a09986 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop05.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop06.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop06.java index 0867f9c65ff4..5de456e99e2d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop06.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop07.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop07.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07.java index abb8f7d3ecd8..dd51434ac5df 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop07.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Loop07 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop07_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop07_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java index 5b8d333cb770..a6cba61baba3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop07_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Loop07_2 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop08.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop08.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop08.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop08.java index b8f443ceb1a0..d0f78260369f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop08.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop08.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop09.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop09.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09.java index 099575fc5adf..2ae2e73390da 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop09.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop09_2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop09_2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java index c17c73f4375e..7a30870e200c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop09_2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop11.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop11.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop11.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop11.java index 813effaeab85..c88d0f751c9d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop11.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop11.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop12.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop12.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop12.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop12.java index d60c5f0a4c7a..76a0ade04d94 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop12.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop12.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop13.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop13.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop13.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop13.java index 979cc1b67d46..826aea22d0a5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop13.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop13.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop14.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop14.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop14.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop14.java index e023a19d5636..ea265f58fb96 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop14.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop14.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop15.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop15.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop15.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop15.java index 0ae95662f748..6553bc24726b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop15.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop15.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Loop15 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop16.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop16.java index 4f2e0f2a9210..06c038dd26cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop16.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests exiting 2 loops at the same time with escape-analysed values flowing out of loops diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop17.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop17.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop17.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop17.java index e81f2acda012..eb01f5807462 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/Loop17.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop17.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopEscape.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopEscape.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java index b8a44142f044..5525ebf9d700 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopEscape.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java @@ -23,11 +23,11 @@ * questions. */ // Checkstyle: stop -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopInline.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopInline.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java index a1a8477d398e..0044cebfbd45 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopInline.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class LoopInline extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java index dbc1e1cd0782..469ed0a5180e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopLastIndexOf.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * see java.lang.String.lastIndexOf(char[], int, int, char[], int ,int, int) diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java index cb9dd4b7d6ee..5b4a0f3a7395 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopNewInstance.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java index 22025a3e7073..0c3344e64884 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopParseLong.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class LoopParseLong extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopPhi.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopPhi.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java index 9de12e606047..ce30b33c6a08 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopPhi.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java index 66fdd55b3336..c066fdc0ddff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopPhiResolutionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java index d9808f65a3a0..960bbb7f57ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopSpilling.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class LoopSpilling extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java index d1151bdc6e22..126d77526eff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopSwitch01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java index ac57f0da272d..3bac5a2fc5cf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/LoopUnroll.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java index e4839ff4a575..355a7f81dc27 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/loop/SpillLoopPhiVariableAtDefinition.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.loop; +package jdk.compiler.graal.jtt.loop; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.jtt.JTTTest; public class SpillLoopPhiVariableAtDefinition extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java index 8def3eacabc7..8b592f4bf689 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ArrayCompare01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java index eefda6688ee3..5a6e72bb920c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ArrayCompare02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java index f01426aa38b1..8c3d0a8a90ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BC_invokevirtual2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java index 11734456b7e4..76bb6d6d60e5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigByteParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java index d86a69b890e7..8d044b8b6573 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigDoubleParams02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java index fddeaa06b51d..b26335ad9d07 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigFloatParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java index fa1f5576cd69..568e4e055630 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigFloatParams02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java index 816e897297c4..d76c5b9c218a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigIntParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java index 3988fd5cb260..8f33d2f21c6e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigIntParams02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java index 4430df029909..9d15a2f94299 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigInterfaceParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java index 2fb4cb2ecac5..4295241e11be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigLongParams02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java index 62a8b97a76f2..742bbbd3184c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java index e45057ce1c2f..03f8b055b418 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java index 312162c12a9f..705b8643cbe4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java @@ -25,11 +25,11 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java index da6537a39ee0..5437ebd40e47 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigMixedParams04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java @@ -25,12 +25,12 @@ /* * Copyright (c) 2007, 2018, Oracle and/or its affiliates. All rights reserved. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /** * Tests different alignment on the stack with extended parameters (index > 5). diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java index ca7aa2e28898..f2744b79eb25 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigObjectParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java index 25631760f3fd..83873baa4c4d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigObjectParams02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java index 129c9cecc4f2..7888c1d37c4c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigParamsAlignment.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java @@ -27,11 +27,11 @@ */ /* */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class BigParamsAlignment extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java index 77a2f0e8559f..2bcf760fccc1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigShortParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java index b407c7322a0c..91cab8586a10 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/BigVirtualParams01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Bubblesort.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Bubblesort.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java index 6684a8022d5a..a1ee9639334e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Bubblesort.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class Bubblesort extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java index d2eb155b186c..83fda8347d24 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ConstantLoadTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class ConstantLoadTest extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Fibonacci.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Fibonacci.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java index ae5bce8dca2a..7da99d7908a9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Fibonacci.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/FloatingReads.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/FloatingReads.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java index dc5e852950a6..b757ba320ce5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/FloatingReads.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class FloatingReads extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java index ecf72ac14b0c..a34840933a1c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java index e49b9630371c..5d8a472f3bb8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java index 9e76e2163a29..9fef41450811 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java index 36fc987a4c3b..37ad583fb951 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeInterface_04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java index 92062db78e3d..87a21a4c0e3d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class InvokeVirtual_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java index 5027d1abd92e..c20660df9ff2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/InvokeVirtual_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java @@ -24,11 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; public class InvokeVirtual_02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Matrix01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Matrix01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java index 81af0e384179..557f8648f3c8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/Matrix01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java index d304e67d0998..30dc95f46433 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/ReferenceMap01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java index 7b4e97be4343..4f6a248daa4e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/StrangeFrames.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/String_format01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/String_format01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format01.java index 5cfa9ed7d6f8..cc073b02966f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/String_format01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/String_format02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/String_format02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format02.java index 3d2e728fbf9a..9064103a521b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/String_format02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java index 182f6a1497ac..7c6baf2e07ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_String01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java index 9a667f59fab0..75e78c7f7f10 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_Unroll.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java index fdd59e157187..936a8e965afc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_boolean01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java index 6209f89e7c25..4a72aa8a30d5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_byte01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java index 4b6ff045ff7b..1c141e975aa2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_char01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java index d8f3c665d957..4106559528cc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_double01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java index a0e88a0ef2c0..2d6a63464785 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_float01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java index f20588f8fc7f..543093d8bdee 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_int01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java index c80156f4ed00..0ffd05e94979 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_long01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java index 20be4617d8fc..9794b76412ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/micro/VarArgs_short01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.micro; +package jdk.compiler.graal.jtt.micro; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java index d72ec4d9fecc..b6c9d4ced930 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class ABCE_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java index ac40f8aba40a..26f00eaeabcf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class ABCE_02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java index f00a7e443de8..0687ccbb9aa5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ABCE_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class ABCE_03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java index 7dc346f5ab48..a56d4888f157 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests calls to the array copy method. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java index 17328044b9dc..cfa5ce87392e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java @@ -22,13 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests calls to the array copy method. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java index 7176628b6723..12e2cc289078 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java @@ -22,13 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests calls to the array copy method. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java index c88d009020a4..a08ff341b485 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests calls to the array copy method. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java index 38985774971f..89a33aded022 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java @@ -22,13 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests calls to the array copy method. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java index f9b5429b9b3b..a09debf129fa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopy06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java @@ -22,13 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests calls to the array copy method. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java index e1f23c1831c2..399154e3665b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayCopyGeneric.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests calls to the array copy method. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java index 5e54ffd0a3c5..19f44f5a1a77 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ArrayLength01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of array length operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java index 642cfab23b25..801facecaf3e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_idiv_16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_idiv_16 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java index a73f08729cae..34293d15deed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_idiv_4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_idiv_4 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java index 25ab39866182..0b9da5f3dde0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_imul_16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_imul_16 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java index f4323b18fe16..5ad3d3a1000b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_imul_4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_imul_4 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java index 023c76e72711..721fd7334918 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldiv_16 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java index 4205be377f96..ea0fcc1eb297 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_ldiv_4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_ldiv_4 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java index 81906be793ff..17bdebee5beb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lmul_16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lmul_16 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java index 0574e62b4a13..37a515e2f1ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lmul_4.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lmul_4 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java index 48e142f57632..ae18639162be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C16.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lshr_C16 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java index f566bd3bdda9..6dc3295a9d2e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C24.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BC_lshr_C24 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java index 43208796ef08..aae836752244 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BC_lshr_C32.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java index 7f484fce7ddb..69cf2dc46140 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BlockSkip01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class BlockSkip01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java index 8aea35d01983..052d39a877f3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/BoxingIdentity.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class BoxingIdentity extends JTTTest { interface ArrayMirror { Object get(int i); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/CE_InstanceOf.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/CE_InstanceOf.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java index 960753891d04..f1064fa3b29e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/CE_InstanceOf.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public class CE_InstanceOf extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Cmov01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Cmov01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java index 08cff9a001ac..5f6f580277b1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Cmov01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Cmov01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Cmov02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Cmov02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java index 14d05fb10771..aa32c9b8be15 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Cmov02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Cmov02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Conditional01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Conditional01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java index 2c0baf614531..b51c5f3e46b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Conditional01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.util.Random; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ @SuppressWarnings("unused") @@ -85,7 +85,7 @@ public int bit(boolean c2) { } private static final int RAM_SIZE = 0x100; - public static final Random RANDOM_INSTANCE = getRandomInstance(); + public static final Random RANDOM_INSTANCE = GraalCompilerTest.getRandomInstance(); private static final int init1 = new Register().val; private static final Register init2 = new CPC().r1; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java index 512e401f9f2f..83dc4912f905 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import jdk.vm.ci.meta.ResolvedJavaMethod; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class ConditionalElimination01 extends JTTTest { private static int x; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java index 9ee89e18ca6c..471afa593485 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConditionalElimination02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.util.EnumSet; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java index ea75dd103d91..7499eec9188d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ConvertCompare.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class ConvertCompare extends JTTTest { public static boolean test(int a, float d) { return a == (double) d; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java index d5afaeccdfb3..fddd16fc87a2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/DeadCode01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class DeadCode01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java index edbed4c56862..2ae5cbd09e74 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/DeadCode02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java index 70f0505a1f1e..ddaf747f4a7d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Cast01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java index 53504a381a19..447f4acbbf4f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java index dda52c9e6a39..8b1a23f2b860 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java index 99bbdf96691b..7a08493d6b72 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests constant folding of float conversions diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java index 7a12fe47eb73..039deebdb480 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Convert04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of float conversions */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java index 802a462e15f8..cc6c94556105 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java index 176c7b086724..fe709480453c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer comparisons. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java index 115d5d851cdd..f35a9dd0a633 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Fold_Double03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java index 51266ce84ef5..e885bbb38c13 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Double04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of double operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java index 6d47c6b81d48..d44a0266c862 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java index ac23a08f520e..b2c4c95241e5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer comparisons. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java index af3638a217f9..a1ef6cab81db 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Float03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java index 9924ea29483a..c0f582b89b8f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_InstanceOf01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java index d1e018527fe2..6615fe2d0fe7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Int01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java index 4a92d55a8eb6..bdf279b39604 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Int02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer comparisons. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java index e594b2c77951..7fed50002404 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Long01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java index 22f88d847ed4..18ac383d09a9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Long02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer comparisons. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java index 5ab44089a21d..dfea4a6c8e57 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Fold_Math01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Fold_Math01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java index 87d0d8425b3d..ee8771552a15 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/GuardMovement.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Assert; import org.junit.Test; -import static org.graalvm.compiler.core.common.GraalOptions.MaximumInliningSize; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.options.OptionValues; +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; public class GuardMovement extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java index 879347229704..f75c3cf3f3d0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/IfNodeCanonicalizationsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.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 org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; +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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java index d74b741c7f9c..efae02f264d0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/InferStamp01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /** * test some stamps in combination with full loop unrolling and shifts. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Inline01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Inline01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java index e0f73141b2c3..aaed8e638e1e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Inline01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Inline01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Inline02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Inline02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java index 80822d75f0dc..e1f75d34a9fd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Inline02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Inline02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/InstanceOf.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/InstanceOf.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java index a0dc3409ae62..b3db6de41c8d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/InstanceOf.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.nodes.LogicNode; +import jdk.compiler.graal.nodes.java.InstanceOfNode; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/LLE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/LLE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java index 9d4293fd15ea..9cf328b7fb9c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/LLE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Test case for local load elimination. It makes sure that the second field store is not eliminated, because * it is recognized that the first store changes the field "field1", so it is no longer guaranteed that it diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java index f55ede29c4c6..edfcb7d011f2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/List_reorder_bug.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ @SuppressWarnings("unused") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Logic0.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Logic0.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java index 7dad296a9dd4..feffdb7f6468 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Logic0.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Logic0 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java index adb6e0426e61..fa5d87b4b8ae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/LongToSomethingArray01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /** * inspired by java.security.SecureRandom.longToByteArray(long). * diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java index 428e369a914c..72b677898d78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Test case for null check elimination. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java index ffc188f6bf03..bb33652fbad6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Test case for null check elimination. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java index 279039efe519..924feee1d263 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Test case for null check elimination. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java index 80dcf5791d5b..b821e560f7b1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Test case for null check elimination. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java index fe7df840b178..5f542ad06538 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class NCE_FlowSensitive01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java index 2cfebf5094d8..57e7a42e22f7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class NCE_FlowSensitive02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java index cbcf26389dc2..6ffe6594c5e6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class NCE_FlowSensitive03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java index c1af8d1a9fe2..43a224bc34f3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java index a53bcb48b9d6..c2cd50055e65 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NCE_FlowSensitive05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.io.ByteArrayOutputStream; import java.io.PrintStream; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class NCE_FlowSensitive05 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java index 807dd36bbd98..73e025dc4f95 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_byte01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java index dc5a0cec3881..7d41e8af2f0e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_byte02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java index 118b1bb36da2..3a5df5fc16cf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_byte03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java index 5f25b1e62793..108a1690aa27 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_byte04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java index 380131799ee9..8814db877371 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_char01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java index db7dfd3b75a2..80799ed96b36 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_char02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java index e067553cf448..dc494060a787 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_char03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_char03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java index 287b96b9db4f..e9bfce83036b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_short01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java index 78cb20b379ca..fb9cc9193ba0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_short02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java index 688802d6b610..18c943426482 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Narrow_short03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Narrow_short03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java index f05548b78081..67ea83528d67 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/NestedLoop_EA.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.util.ListIterator; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java index 675c83889b4c..6217a17f95c0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Phi01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java index 3edba439d6cc..2e43302e009d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Phi02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java index 7c8ebad10c14..e0947cf8cfc2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Phi03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Phi03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java index 90bc7e49bb0f..5cdbf9fd39e9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/ReassociateConstants.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java index fb8d53bf08e9..aa15c576b70f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Convert01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization integer conversions. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java index f37299d20fc1..34600b83c58e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Double01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of double operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java index 95c6c013c216..103a407e4330 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Float01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java index e3f50295c624..a04bf3859b45 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java index 1985589cb04a..46e821aabd18 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests constant folding of integer operations. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java index efe8ff09257e..ee8030fb4f9b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java index 9c457dcf9ca0..8e1d4118d27b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Int04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java index 24e767c9f614..4ebc5b29778b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java index adbf382e3928..fc54e4263e60 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_IntShift02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests optimization of integer operations. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java index bbd7e67c4149..75cd261ad6c4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java index 68664cd59d7e..7a8400c1341b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java index 5dee2c077f29..410e0080c19b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java index d9ea70e57579..3c65b2117712 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_Long04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java index 4eef1341a6cd..84cba8b82464 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java index e943bf737c57..dacae7d4f347 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Reduce_LongShift02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java index c0406249375a..02d1407fd57d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SchedulingBug_01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class SchedulingBug_01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java index 7471e0caa9d5..810227756c99 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SignExtendShort.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class SignExtendShort extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Switch01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Switch01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java index 77a23d923dc7..0c69fb8209e4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Switch01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of switches. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Switch02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Switch02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java index 1a6a62e335e0..d5a3e9293d90 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/Switch02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java @@ -22,16 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.util.HashMap; import java.util.HashSet; import java.util.LinkedList; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of switches. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java index 9033f492a282..2c7e75e7d658 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/SwitchHashTableTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TrichotomyFloats.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TrichotomyFloats.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java index 06b536b32b25..39a49bf7d7a6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TrichotomyFloats.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; import org.junit.runners.Parameterized.Parameter; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java index e4a601d42058..4f6779fa6635 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TrichotomyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.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 org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java index 4c571836c8a0..b4a4204b6b7f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/TypeCastElem.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class TypeCastElem extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java index 50564e5ba8a0..9d3af2f1f08c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/UnsafeDeopt.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import java.nio.ByteBuffer; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; import org.junit.internal.AssumptionViolatedException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java index 1ecc4a0cc171..d04544e3307f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Cast01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java index fc5954025488..028f9e04a04a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Cast02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java index 54b575a6aa45..d428c863a0c7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Convert01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization integer conversions. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java index d6b3f076c56a..c333bc8b7b4b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Convert02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization integer conversions. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java index 5e9096f3126d..84316947346e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java index c9b7e0a2e25d..dfe5d55dae64 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java index 2152e81b9364..5aa2bcff7273 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Double03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java index dc985dd99bb0..6853d8714786 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Field01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java index 0497ef7b0bf8..a0298d4a76fc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Field02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests constant folding of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java index df02f4b7cce0..70da463ca69a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Float01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests optimization of float operations. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java index 2efc5592d449..3f2ab9651f74 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Float02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of float operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java index 3d89d3a485be..e42a06adabd2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests value numbering of instanceof operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java index 57b64f977096..24639b3300a1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests value numbering of instanceof operations. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java index 7089d636523c..2bd44594df2e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_InstanceOf03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests value numbering of instanceof operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java index 72b50463242b..c905950d950d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests value numbering of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java index 579aa62be80e..53beb86f6d8a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java index c0919528188f..947d6f0f67cf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Int03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests value numbering of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java index bc5e095131e2..63a933c945e8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests value numbering of long operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java index 384eae30423a..5f977ba53003 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests optimization of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java index ab93cabcd8db..891e0a600b61 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Long03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; /* * Tests value numbering of long operations. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java index 3fc6be7abbc6..c6e3c0b316cb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/optimize/VN_Loop01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.optimize; +package jdk.compiler.graal.jtt.optimize; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* * Tests value numbering of integer operations. */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java index 145de162046d..9292aa05146f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_get01 extends JTTTest { private static final String[] array = {"0", "1", "2"}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java index 81298865c406..5845c8168003 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_get02 extends JTTTest { private static final int[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java index e3265dfd28ce..3a041a99ee1b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_get03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_get03 extends JTTTest { private static final byte[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java index 1df95e71b312..b64eeeb73cc8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getBoolean01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getBoolean01 extends JTTTest { private static final boolean[] array = {true, false, true}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java index d4eab6b6c6ce..b5c3cc668eab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getByte01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getByte01 extends JTTTest { private static final byte[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java index d97eb2fa498e..ab41a5c094a0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getChar01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getChar01 extends JTTTest { private static final char[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java index ef4487f84c22..7d9f6b1064e7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getDouble01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getDouble01 extends JTTTest { private static final double[] array = {11.1d, 21.1d, 42.1d}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java index 83561ad3073e..6ceb40046a0a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getFloat01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getFloat01 extends JTTTest { private static final float[] array = {11.1f, 21.1f, 42.1f}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java index a0bc8d5f304c..e939c2ce8603 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getInt01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getInt01 extends JTTTest { private static final int[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java index f0972de4057d..3fe45aa45421 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getLength01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getLength01 extends JTTTest { private static final int[] array0 = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java index 1ee09bb227a0..e2f2069a6362 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getLong01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getLong01 extends JTTTest { private static final long[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java index 89e5936f3f6c..897c465406de 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_getShort01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_getShort01 extends JTTTest { private static final short[] array = {11, 21, 42}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java index df4916d30dee..23ede2f5c4eb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_newInstance01 extends JTTTest { public static boolean test(int i) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java index 578262cf9e29..72f08d0ede78 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_newInstance02 extends JTTTest { public static boolean test(int i) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java index 700d1c3561de..31e6cc1a96aa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_newInstance03 extends JTTTest { public static boolean test(int i) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java index 05f1a7727924..d1ebad922f5b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_newInstance04 extends JTTTest { public static boolean test(int i, int j) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java index 2a22d17efec1..da90e44ba06a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_newInstance05 extends JTTTest { public static boolean test(int i, int j) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java index c81647a5acd1..21265f76265f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_newInstance06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_newInstance06 extends JTTTest { public static boolean test(int i) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java index 20c6dff53436..5032280b0db9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_set01 extends JTTTest { private static final String[] array = {"x", "x", "x"}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java index 7314d4eba722..46d262359ecc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_set02 extends JTTTest { private static final int[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java index 05873b1f6674..237fd2b00a07 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_set03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_set03 extends JTTTest { private static final byte[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java index a25c6c1e8f2d..e9b7e523ed97 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setBoolean01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setBoolean01 extends JTTTest { private static final boolean[] array = {false, false, false}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java index 50984409fc92..20a715c755b7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setByte01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setByte01 extends JTTTest { private static final byte[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java index f8726e18ed82..039f42d9c3bf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setChar01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setChar01 extends JTTTest { private static final char[] array = {0, 0, 0}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java index d1cbf7820e51..7d111e40fffc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setDouble01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setDouble01 extends JTTTest { private static final double[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java index 9336b3745a9b..79c29fba0046 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setFloat01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setFloat01 extends JTTTest { private static final float[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java index 270ff0a4e37f..792ab4e61f3b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setInt01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setInt01 extends JTTTest { private static final int[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java index 50e3a3c415ba..82df7c46b464 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setLong01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setLong01 extends JTTTest { private static final long[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java index 29ae1f4cebae..a68fc2e8a55e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Array_setShort01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java @@ -24,14 +24,13 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Array; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Array_setShort01 extends JTTTest { private static final short[] array = {-1, -1, -1}; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java index 22cc02717732..02cc98b4bf7c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredField01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Class_getDeclaredField01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java index 8fe585df00f4..8251c5e843d1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getDeclaredMethod01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Class_getDeclaredMethod01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java index 90196c7a2ea8..c185c00365fb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getField01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Class_getField01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java index 413d073ba61a..ed7e4a7ccd7a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getField02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Class_getField02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java index 3848c4032b18..82dfdc52894c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getMethod01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Class_getMethod01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java index ae3e1c13e723..af9e31b6af3d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_getMethod02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Class_getMethod02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java index 83f8dfaf5c01..31fa1742c498 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Class_newInstance01 extends JTTTest { @SuppressWarnings({"deprecation", "unused"}) diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java index 862831ac0a62..6971fc4779fc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Class_newInstance02 extends JTTTest { @SuppressWarnings({"deprecation", "unused"}) diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java index 1bcadefde14f..6c6e22ab42c8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Class_newInstance03 extends JTTTest { public abstract static class AbstractClass { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java index 2a608963e7e0..79dafb173dff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance06.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Class_newInstance06 extends JTTTest { public static final class Class_newInstance { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java index 15bd7edc49ab..0bceaa1beb4f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Class_newInstance07.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Class_newInstance07 extends JTTTest { public static final class Class_newInstance { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java index 363034429a14..189a3418a5b6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_get01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java index fa069f9b4d64..eeb63bae35f7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_get02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java index f122999f4bf9..a0ffa61a268e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.Field; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_get03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java index 2fc6e312768b..5bb7531a1a64 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_get04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_get04 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java index b029d987913e..1029f641c92e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_getType01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_getType01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java index 11bc3a9e254a..bd20f683bd38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_set01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java index 9edada86b118..3e7c2dff53b9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.jtt.JTTTest; +import jdk.compiler.graal.debug.DebugOptions; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; /* diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java index fcc530fb324a..77706a9df400 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Field_set03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Field_set03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java index 3d2928494d1d..bdd6ae609814 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_except01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Invoke_except01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java index 35998536f90b..2388dd23afb4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.InvocationTargetException; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Invoke_main01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java index 41747e657b06..c8c24ca6d5c2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.InvocationTargetException; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Invoke_main02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java index 2dbbac2fa440..1f7f43e3e0e0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_main03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Invoke_main03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java index eea14f569b92..411d6f1f72d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Invoke_virtual01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Invoke_virtual01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java index ef71128ae49a..fc2e188438e4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Method_getParameterTypes01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ @SuppressWarnings("unused") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java index 819360898b7d..da119df26f7a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/reflect/Method_getReturnType01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.reflect; +package jdk.compiler.graal.jtt.reflect; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class Method_getReturnType01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java index 914ee61c58d7..b1cbfa5d051b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitor_contended01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java index 543c94ecad10..f321f413aa7d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitor_notowner01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java index e6919ef0581d..3d239ca94618 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitorenter01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java index f4d46c741c49..2025e811f2fa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Monitorenter02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java index 08596c136234..b5e4c7b8938c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java index 14d2aad13617..cfddecc3e753 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java index 6edd056a25e6..71193bf4596c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java @@ -24,12 +24,12 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.core.common.CancellationBailoutException; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.nodes.Cancellable; +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 org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java index 40dcb03cfec6..902954f7a3f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Object_wait04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java index db6cae861665..a88574a95c01 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/SynchronizedLoopExit01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/SynchronizedParserInlineTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/SynchronizedParserInlineTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java index 12fd1256386f..c3ed41a15bd6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/SynchronizedParserInlineTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; public final class SynchronizedParserInlineTest extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java index ceae2d18fb5f..f16d9fd8f215 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class ThreadLocal01 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java index 93e35b80f207..fbdcfa90d171 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class ThreadLocal02 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java index a4b42bd0da92..d7af5e03d1aa 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/ThreadLocal03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ public class ThreadLocal03 extends JTTTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java index 3a79cfc5a080..9d794c620a4e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_currentThread01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_currentThread01 extends JTTTest { public static boolean test() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java index f233c507f5c4..65a3d8ba5eb9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_getState01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_getState01 extends JTTTest { public static boolean test() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java index ac0812d595ff..fdf93835b706 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_getState02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_getState02 extends JTTTest { public static boolean test() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java index a639c770474e..4080febe084a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_holdsLock01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_holdsLock01 extends JTTTest { static final Object monitor = new Object(); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java index 22ba1610cd4f..aa20267d99a6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isAlive01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_isAlive01 extends JTTTest { public static boolean test() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java index d07d591ae85e..8e65a540e4d7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_isInterrupted01 extends JTTTest { public static boolean test() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java index bb2092451209..57c3102d5386 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java @@ -26,9 +26,9 @@ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java index 66fe8f49fc43..c142c00da856 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java index c8d68565c84d..c3d46fd2c017 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted04.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - /* */ diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java index f33ca3e57d09..bca84d1680f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_isInterrupted05.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java index 9b93790968a4..06f7de830b95 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java index 6423ed33418b..a0c1d573f026 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join03.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join03.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java index fb8d65b5dc7b..62c4b3624d9c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_join03.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_new01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_new01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java index 4794364ed708..e0b78a654803 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_new01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_new01 extends JTTTest { public static boolean test(int i) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_new02.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_new02.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java index 0d8d20c5ccde..7c2a62cc5a1a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_new02.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public class Thread_new02 extends JTTTest { private static class TestClass implements Runnable { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java index 7520951b57dd..725f9239e6a8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_setPriority01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java @@ -24,12 +24,11 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; -import org.graalvm.compiler.jtt.JTTTest; - public final class Thread_setPriority01 extends JTTTest { public static boolean test(int i) { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java index abbb4e78fbbd..db769a3d7118 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_sleep01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java index 5621e7135f1b..c2744ca032c7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/jtt/threads/Thread_yield01.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java @@ -24,9 +24,9 @@ */ /* */ -package org.graalvm.compiler.jtt.threads; +package jdk.compiler.graal.jtt.threads; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Rule; import org.junit.Test; import org.junit.rules.TestRule; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java index 23058d688909..62bb809f896d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/ConstantStackCastTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.jtt; +package jdk.compiler.graal.lir.jtt; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java index 0bf99f92512e..158d8662d66e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.jtt; +package jdk.compiler.graal.lir.jtt; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED; +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 java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; @@ -34,19 +34,19 @@ import java.lang.reflect.Modifier; import java.lang.reflect.Type; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.jtt.JTTTest; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java index 8afe88274e7d..7cbd66b8131e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTestSpecification.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.jtt; +package jdk.compiler.graal.lir.jtt; import java.util.HashMap; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.lir.gen.LIRGeneratorTool; +import jdk.compiler.graal.nodes.ValueNode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java index 31e0a06e22f0..2e4c15e0afd4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/LIRTestTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.jtt; +package jdk.compiler.graal.lir.jtt; import org.junit.Test; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +import jdk.compiler.graal.lir.gen.LIRGeneratorTool; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java index f4d1dd67e428..7ec2667b3e52 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/StackMoveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.jtt; +package jdk.compiler.graal.lir.jtt; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.PlatformKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java index 4f26b07accc5..0c81fab4f053 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/jtt/StackStoreLoadTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java @@ -23,16 +23,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.jtt; +package jdk.compiler.graal.lir.jtt; import org.junit.Before; import org.junit.Test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.PlatformKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java index 999d602d996a..90584665bc97 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/test/CompositeValueReplacementTest1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.test; +package jdk.compiler.graal.lir.test; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.CompositeValue; -import org.graalvm.compiler.lir.InstructionValueConsumer; -import org.graalvm.compiler.lir.InstructionValueProcedure; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java index fc311b034772..903466af2e09 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/lir/test/GenericValueMapTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.test; +package jdk.compiler.graal.lir.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; import org.junit.Test; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.util.GenericValueMap; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.lir.Variable; +import jdk.compiler.graal.lir.util.GenericValueMap; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.Register.RegisterCategory; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java index cd96fda8a963..52b746c18a1c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/loop/test/LoopPartialUnrollTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java @@ -22,42 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.loop.test; +package jdk.compiler.graal.loop.test; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectIterationCount; +import static jdk.compiler.graal.api.directives.GraalDirectives.injectBranchProbability; +import static jdk.compiler.graal.api.directives.GraalDirectives.injectIterationCount; import java.util.ListIterator; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.loop.phases.LoopPartialUnrollPhase; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopFragmentInside; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.common.RemoveValueProxyPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java index 0b716cdbfe90..b0e4ba3cc15a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/loop/test/LoopsDataTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.loop.test; +package jdk.compiler.graal.loop.test; import java.util.HashSet; import java.util.Set; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java index 950d3a03a5ad..f8ab97d03de9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AbstractObjectStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Assert; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.common.type.Stamp; +import jdk.compiler.graal.core.common.type.TypeReference; public abstract class AbstractObjectStampTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java index 2ddfc3e0a49b..5cf6b981ef33 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AddNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AndNodeCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AndNodeCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java index fa9d0fb9fe15..18e93deb946c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/AndNodeCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java @@ -23,10 +23,10 @@ * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Test; public class AndNodeCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/CompareZeroExtendWithConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/CompareZeroExtendWithConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java index a0613bf26df9..58f10d8ea290 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/CompareZeroExtendWithConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class CompareZeroExtendWithConstantTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ConstantNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ConstantNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java index 04e447cecaaa..ee931201ba9b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ConstantNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.ConstantNode; +import jdk.compiler.graal.nodeinfo.Verbosity; +import jdk.compiler.graal.nodes.ConstantNode; import org.junit.Test; public class ConstantNodeTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ExceptionLivenessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ExceptionLivenessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java index b3797fa337bb..4a47d025d452 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ExceptionLivenessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing; +import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsing; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.phases.HighTier; +import jdk.compiler.graal.options.OptionValues; import org.junit.Test; public class ExceptionLivenessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/FloatStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/FloatStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java index ec1233b95b63..6dd570ddaf7f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/FloatStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.test.GraphTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/GraphStateTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/GraphStateTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java index 2065c9cd4059..728615d1e136 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/GraphStateTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.GraphState; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java index 09d47a083729..b99da154ea6d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.SubNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.SimplifierTool; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; +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; import org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java index e8e6f8b48063..b79d632b95a9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IfNodeCanonicalizationTest2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java @@ -24,14 +24,14 @@ * questions. */ -package org.graalvm.compiler.nodes.test; - -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.core.test.TestPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/InliningLogTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/InliningLogTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java index 1de5f9ec74dd..025e544d63e5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/InliningLogTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.nodes.InliningLog; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.loop.LoopPolicies; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerShuffleBitsStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerShuffleBitsStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java index eed8c1bd7f09..079f24b3a3a0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerShuffleBitsStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampFoldTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampFoldTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java index 00d32c12ff4c..502170f49823 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampFoldTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.HashSet; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.test.GraalTest; +import jdk.compiler.graal.core.common.type.ArithmeticOpTable; +import jdk.compiler.graal.core.common.type.IntegerStamp; +import jdk.compiler.graal.test.GraalTest; import org.junit.Test; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampMaskTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampMaskTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java index 9fc64eeb1fe0..daf2d94826a7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampMaskTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.test.GraalTest; +import jdk.compiler.graal.core.common.type.IntegerStamp; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.test.GraalTest; import org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java index 21e52042123b..c4500b30f659 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/IntegerStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java @@ -22,9 +22,8 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -34,21 +33,22 @@ import java.util.List; import java.util.stream.Stream; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.test.GraphTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Before; import org.junit.Test; @@ -70,7 +70,7 @@ private static Stamp addIntStamp(Stamp a, Stamp b) { @Before public void before() { - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); DebugContext debug = getDebug(options); graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.YES).build(); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LongShuffleBitsStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LongShuffleBitsStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java index 1d1a23035017..db20f345f311 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LongShuffleBitsStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java index 948db47f0882..94010c8b4519 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LoopLivenessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.java.LargeLocalLiveness; -import org.graalvm.compiler.java.SmallLocalLiveness; +import jdk.compiler.graal.java.LargeLocalLiveness; +import jdk.compiler.graal.java.SmallLocalLiveness; public class LoopLivenessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java index 0a406557e582..09ca220d7aa3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/LoopPhiCanonicalizerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.iterators.NodePredicate; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.util.GraphOrder; +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 org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NarrowPreservesOrderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NarrowPreservesOrderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java index c471fcc18c1c..cb2f70d305db 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NarrowPreservesOrderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import static org.graalvm.compiler.core.common.calc.CanonicalCondition.BT; -import static org.graalvm.compiler.core.common.calc.CanonicalCondition.LT; +import static jdk.compiler.graal.core.common.calc.CanonicalCondition.BT; +import static jdk.compiler.graal.core.common.calc.CanonicalCondition.LT; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.graph.test.GraphTest; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.calc.NarrowNode; +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 org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NarrowTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NarrowTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java index 12185f489545..889c9b8d030f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NarrowTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class NarrowTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java index 4f2061c5f8e2..28e68ea4fc5f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/NegateNodeCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import static org.graalvm.compiler.core.test.GraalCompilerTest.getInitialOptions; import static org.junit.Assert.assertEquals; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Before; import org.junit.Test; @@ -49,7 +49,7 @@ public class NegateNodeCanonicalizationTest { @Before public void before() { - OptionValues options = getInitialOptions(); + OptionValues options = GraalCompilerTest.getInitialOptions(); DebugContext debug = new Builder(options).build(); graph = new StructuredGraph.Builder(options, debug, AllowAssumptions.YES).build(); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java index b5dfb991e80b..d3003d903c14 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampJoinTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.nodes.type.StampTool; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java index 66a5ba3eaa9d..9a5576faf9cb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampMeetTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java index ea6aed48cf35..2b70cd904477 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ObjectStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.common.type.AbstractObjectStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/OptimizationLogTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/OptimizationLogTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java index d76dce5af512..41ea10cd08d6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/OptimizationLogTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.Optional; import java.util.function.Supplier; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.OptimizationLog; -import org.graalvm.compiler.nodes.OptimizationLogImpl; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.ClassTypeSequence; -import org.graalvm.compiler.phases.util.Providers; +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 org.junit.Assert; import org.junit.Test; @@ -150,8 +150,8 @@ public void buildOptimizationTreeWhenEnabled() { /** * Tests that there is no reporting going on when the optimization log is disabled. In * particular, the optimization tree shall not be built and - * {@link org.graalvm.compiler.nodes.OptimizationLog.OptimizationEntry#withLazyProperty(String, Supplier) - * lazy properties} shall not be consumed. + * {@link OptimizationLog.OptimizationEntry#withLazyProperty(String, Supplier) lazy properties} + * shall not be consumed. */ @Test public void noReportingWhenDisabled() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/OrNodeCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/OrNodeCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java index 77b3a0af62af..89db2f3d2b33 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/OrNodeCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java @@ -23,10 +23,10 @@ * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Test; public class OrNodeCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/PrimitiveStampBoundaryTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/PrimitiveStampBoundaryTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java index 3605518caed5..554475a15f1f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/PrimitiveStampBoundaryTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.EnumSet; import java.util.HashSet; -import org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.core.common.calc.FloatConvertCategory; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.PrimitiveStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Test; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java index c577e2f6e304..a6e5296b454c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampDoubleToLongTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.nodes.NodeView; +import jdk.compiler.graal.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 org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java index 6c08504c4e1e..b30decf5ffad 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampFloatToIntTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.nodes.NodeView; +import jdk.compiler.graal.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 org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java index ffb0b35b72a4..659b360edaf4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampIntToFloatTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.nodes.NodeView; +import jdk.compiler.graal.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 org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java index 35126cfc78a6..79aa2710c48e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampLongToDoubleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.nodes.NodeView; +import jdk.compiler.graal.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 org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java index 719897ac1042..2724448f3a6e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ReinterpretStampTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; +import jdk.compiler.graal.nodes.calc.ReinterpretNode; /** * Unit tests for the {@link ReinterpretNode#inferStamp} method. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java index b49abbd92321..6efbc1e4b8ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/ShortCircuitOrNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.util.function.Function; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData; -import org.graalvm.compiler.nodes.ShortCircuitOrNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StampInverterTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StampInverterTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java index 69d14a8a4455..ea41ac090f6d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StampInverterTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import static org.junit.Assert.assertEquals; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; -import org.graalvm.compiler.test.GraalTest; +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 org.junit.Test; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StampToolTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StampToolTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java index 0b938597782a..f8c8f6ea579a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StampToolTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import static org.graalvm.compiler.nodes.type.StampTool.stampForTrailingZeros; -import static org.graalvm.compiler.test.GraalTest.assertFalse; -import static org.graalvm.compiler.test.GraalTest.assertTrue; +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 org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.test.GraphTest; -import org.graalvm.compiler.nodes.type.StampTool; +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 org.junit.Test; public class StampToolTest extends GraphTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java index 7fb154b96cbe..eb433a4482da 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StaticFieldAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; import java.lang.reflect.Constructor; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; import org.junit.Test; public class StaticFieldAccessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java index 5f0b25eb9f1f..3414141bf49a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/StructuredGraphTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/SubCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/SubCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java index 8e1b5ed8e4ca..320db57788a7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/SubCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class SubCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/TruncateCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/TruncateCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java index a3fa9e6acfed..fb699cafc486 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/TruncateCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java @@ -24,10 +24,10 @@ * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.calc.RoundNode; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.calc.RoundNode; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/XorNodeCanonicalizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/XorNodeCanonicalizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java index 69034d614b55..e033f66eaf64 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/nodes/test/XorNodeCanonicalizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java @@ -23,10 +23,10 @@ * questions. */ -package org.graalvm.compiler.nodes.test; +package jdk.compiler.graal.nodes.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Test; public class XorNodeCanonicalizationTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java index e05902672050..5c23abedd278 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/options/test/NestedBooleanOptionKeyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java @@ -28,23 +28,23 @@ * @run junit jdk.vm.ci.options.test.NestedBooleanOptionKeyTest */ -package org.graalvm.compiler.options.test; - -import static org.graalvm.compiler.options.test.NestedBooleanOptionKeyTest.Options.NestedOption0; -import static org.graalvm.compiler.options.test.NestedBooleanOptionKeyTest.Options.NestedOption1; -import static org.graalvm.compiler.options.test.NestedBooleanOptionKeyTest.Options.NestedOption2; -import static org.graalvm.compiler.options.test.NestedBooleanOptionKeyTest.Options.Parent0; -import static org.graalvm.compiler.options.test.NestedBooleanOptionKeyTest.Options.Parent1; -import static org.graalvm.compiler.options.test.NestedBooleanOptionKeyTest.Options.Parent2; -import static org.junit.Assert.assertEquals; +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; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import org.graalvm.compiler.options.NestedBooleanOptionKey; -import org.graalvm.compiler.options.OptionDescriptor; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; public class NestedBooleanOptionKeyTest { @@ -67,9 +67,9 @@ public static class Options { @Test public void testGetParentOption() { - assertEquals(NestedOption0.getParentOption(), Parent0); - assertEquals(NestedOption1.getParentOption(), Parent1); - assertEquals(NestedOption2.getParentOption(), Parent2); + Assert.assertEquals(NestedOption0.getParentOption(), Parent0); + Assert.assertEquals(NestedOption1.getParentOption(), Parent1); + Assert.assertEquals(NestedOption2.getParentOption(), Parent2); } @Test diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/options/test/TestOptionKey.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/TestOptionKey.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/options/test/TestOptionKey.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/TestOptionKey.java index ae7c8b336c84..ea7110bacd71 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/options/test/TestOptionKey.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/TestOptionKey.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.options.test; - -import static org.graalvm.compiler.options.OptionValues.asMap; -import static org.graalvm.compiler.options.OptionValues.newOptionMap; -import static org.graalvm.compiler.options.OptionsParser.parseOptionValue; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyDeprecatedOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyOtherOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyIntegerOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyLongOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyBooleanOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyFloatOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyDoubleOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MyMultiEnumOption; -import static org.graalvm.compiler.options.test.TestOptionKey.Options.MySecondOption; -import static org.graalvm.compiler.options.test.TestOptionKey.TestEnum.Value2; -import static org.graalvm.compiler.options.test.TestOptionKey.TestEnum.Value3; -import static org.graalvm.compiler.options.test.TestOptionKey.TestEnum.Value4; +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; 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 org.graalvm.compiler.options.EnumMultiOptionKey; -import org.graalvm.compiler.options.EnumOptionKey; -import org.graalvm.compiler.options.ModifiableOptionValues; -import org.graalvm.compiler.options.OptionDescriptor; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionDescriptorsMap; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -126,14 +126,14 @@ public static class Options { @Test public void testGetValueOrDefault() { EconomicMap, Object> map = newOptionMap(); - assertEquals("original", MyOption.getValueOrDefault(map)); + Assert.assertEquals("original", MyOption.getValueOrDefault(map)); MyOption.putIfAbsent(map, "new value 1"); - assertEquals("new value 1", MyOption.getValueOrDefault(map)); + Assert.assertEquals("new value 1", MyOption.getValueOrDefault(map)); } @Test public void testToString() throws IOException { - assertEquals("MyOption", MyOption.toString()); + Assert.assertEquals("MyOption", MyOption.toString()); EconomicMap, Object> map = asMap(MyOption, "new value 1"); OptionValues optionsValues = new OptionValues(map); assertEquals("{MyOption=new value 1}", optionsValues.toString()); @@ -374,7 +374,7 @@ public void testOptionDescriptors() { Assert.assertEquals(desc.getDeprecationMessage(), "Some deprecation message"); Assert.assertEquals(desc.getHelp(), "Help for MyDeprecatedOption with"); Assert.assertEquals(desc.getExtraHelp(), List.of("some extra text on", "following lines.")); - Assert.assertEquals(desc.getLocation(), "org.graalvm.compiler.options.test.TestOptionKey$Options.MyDeprecatedOption"); + Assert.assertEquals(desc.getLocation(), Options.class.getName() + ".MyDeprecatedOption"); EconomicMap map = EconomicMap.create(); map.put("MyOption", MyOption.getDescriptor()); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java index b15f91ae0a9b..8d60df90b85c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/phases/common/test/StampFactoryTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.phases.common.test; +package jdk.compiler.graal.phases.common.test; import java.lang.reflect.Method; +import jdk.compiler.graal.api.test.Graal; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.MetaAccessProvider; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.runtime.RuntimeProvider; +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; public class StampFactoryTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayCopyExceptionSeenTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayCopyExceptionSeenTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java index 04e3214833d4..0d9cf1e243a4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayCopyExceptionSeenTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.core.common.GraalOptions.StressInvokeWithExceptionNode; +import static jdk.compiler.graal.core.common.GraalOptions.StressInvokeWithExceptionNode; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.spi.ProfileProvider; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayEqualsConstantLengthTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayEqualsConstantLengthTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java index 0cd06d3357a7..e0b2dd16160c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayEqualsConstantLengthTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; +import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration; +import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin; +import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; import org.junit.Test; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java index 990acfad35a6..a72a4c8b484f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArrayStoreBytecodeExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.ArrayList; import java.util.Collection; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java index 50a57b46f37d..3c6b502889b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +import static jdk.compiler.graal.nodes.StructuredGraph.AllowAssumptions; import java.util.Arrays; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java index 62a9fe7fb389..d1ad56f25f89 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ArraysSubstitutionsTestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java @@ -22,13 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; + +import jdk.compiler.graal.replacements.StandardGraphBuilderPlugins; import java.util.Arrays; /** - * Tests registerArraysPlugins in - * {@link org.graalvm.compiler.replacements.StandardGraphBuilderPlugins}. + * Tests registerArraysPlugins in {@link StandardGraphBuilderPlugins}. */ public class ArraysSubstitutionsTestBase extends MethodSubstitutionTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java index 61c1939a8182..24f839401cc2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/BitOpNodesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; - -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.replacements.nodes.BitScanReverseNode; +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; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java index 730fa1e67707..d0bc1970d672 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/BytecodeExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CharIsDigitTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CharIsDigitTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java index 559a6ff8be4f..95021ebc6e11 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CharIsDigitTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class CharIsDigitTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CheckIndexTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CheckIndexTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java index 624a7e2f12e8..3d7e30c98465 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CheckIndexTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java index dc166a2b599b..213d2cef184c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ClassCastBytecodeExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.ArrayList; import java.util.Collection; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java index a4ce7b752796..5e0484567c5c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CompiledExceptionHandlerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import org.graalvm.compiler.nodes.java.ExceptionObjectNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java similarity index 75% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java index f95bfed18455..cdf3c48dab5e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CompiledNullPointerExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; +import static jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode.CheckAll; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CountPositivesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CountPositivesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java index 30137e5b42c2..f4cce2314377 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/CountPositivesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.Collections; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java index 01d5bdf01419..d2459747ee55 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.Random; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.test.ExportingClassLoader; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.AbstractInliningPhase; +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 org.junit.Assert; import org.junit.Test; import org.objectweb.asm.ClassWriter; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java index a49e759c6c19..8bee7306f396 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnIntegerExactTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import jdk.vm.ci.meta.SpeculationLog; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; +import jdk.compiler.graal.code.CompilationResult; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.debug.DebugContext; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java index 7c41834a3de0..ec50b46d0e28 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DeoptimizeOnVolatileReadTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.phases.OptimisticOptimizations; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.phases.OptimisticOptimizations; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java index 80e62afcb30f..beb17a1728bd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DerivedOopTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.Objects; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordCastNode; +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 org.junit.Assert; import org.junit.Rule; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java index 5017a9ea5c4d..cfec18116b86 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/DynamicNewArrayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.reflect.Array; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java index 25d96471c5b1..bc7987a7807f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/EdgesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; import java.lang.reflect.Method; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Edges; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.policy.InlineMethodSubstitutionsPolicy; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/EncodeArrayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/EncodeArrayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java index be73e92b8ffd..bbf33ec6a319 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/EncodeArrayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java index 5632cfbe8633..d45416a763b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/FloatArraysEqualsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.Arrays; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; +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 org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/HalfFloatTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/HalfFloatTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java index d92aa20b61da..9755cadbf007 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/HalfFloatTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.serviceprovider.JavaVersionUtil.JAVA_SPEC; +import static jdk.compiler.graal.serviceprovider.JavaVersionUtil.JAVA_SPEC; import static org.junit.Assume.assumeTrue; -import org.graalvm.compiler.jtt.JTTTest; +import jdk.compiler.graal.jtt.JTTTest; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/HasNegativesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/HasNegativesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java index e7eb988cb12c..e3aa37503c98 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/HasNegativesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Test; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java index c1c03a1ce60a..6f4b5afd0e7d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IndexOobBytecodeExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.ArrayList; import java.util.Collection; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java index 56961a44c217..966c5cf49f55 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InstanceOfDynamicTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.java.InstanceOfDynamicNode; /** * Tests for {@link InstanceOfDynamicNode}. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java index 3923336c4776..8ac06880f17e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InstanceOfTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.Arrays; import java.util.HashMap; @@ -30,13 +30,13 @@ import java.util.Map; import java.util.TreeMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.phases.common.AbstractInliningPhase; +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 org.junit.Test; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerExactExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerExactExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java index 09705d68a109..362e785b70de 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerExactExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java index 01a9e7888ac0..f30307e2b49e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerExactFoldTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import static org.junit.Assert.assertNotNull; @@ -30,25 +30,25 @@ import java.util.Collection; import java.util.List; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.replacements.nodes.arithmetic.BinaryIntegerExactArithmeticSplitNode; -import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticNode; -import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode; -import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerNegExactSplitNode; +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 org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java index c2dfa1e168e0..d81e0af1a1c0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/IntegerSubOverflowsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.common.type.IntegerStamp; +import jdk.compiler.graal.core.common.type.IntegerStamp; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java index 52fdea302909..f13f737eb85a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InvokeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.phases.common.AbstractInliningPhase; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.phases.common.AbstractInliningPhase; /** * Tests the implementation of the snippets for lowering the INVOKE* instructions. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InvokerSignatureMismatchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InvokerSignatureMismatchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java index ef7a16933332..ed2aff186422 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/InvokerSignatureMismatchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; +import static jdk.compiler.graal.test.SubprocessUtil.withoutDebuggerArguments; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.util.List; -import org.graalvm.compiler.core.test.CustomizedBytecodePatternTest; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +import jdk.compiler.graal.core.test.CustomizedBytecodePatternTest; +import jdk.compiler.graal.test.SubprocessUtil; +import jdk.compiler.graal.test.SubprocessUtil.Subprocess; import org.junit.Test; import org.objectweb.asm.ClassWriter; import org.objectweb.asm.MethodVisitor; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MathMultiplyHighTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MathMultiplyHighTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java index 79623f5f718d..defe514acece 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MathMultiplyHighTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java @@ -23,14 +23,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.IntegerMulHighNode; -import org.graalvm.compiler.nodes.extended.OpaqueValueNode; -import org.graalvm.compiler.nodes.spi.SimplifierTool; -import org.graalvm.compiler.nodes.util.GraphUtil; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MathRoundTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MathRoundTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java index 214961398ba1..398ba769fe66 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MathRoundTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class MathRoundTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodHandleImplTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodHandleImplTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java index 3c02d0c64511..6f8b882407fd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodHandleImplTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodHandleMacroTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodHandleMacroTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java index f1d5c9d4ddb3..e51e38647d3f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodHandleMacroTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodType; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.replacements.InlineDuringParsingPlugin; -import org.graalvm.compiler.replacements.nodes.MacroNode; +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 org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java index ebb4e5a1003c..77a804e39bc4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MethodSubstitutionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.replacements.nodes.MacroNode; +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.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java index 74d9125164d8..78839e73131f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/MonitorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java @@ -22,14 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; +import jdk.compiler.graal.nodes.NodeView; import org.junit.Test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.replacements.BoxingSnippets; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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; public class MonitorTest extends GraalCompilerTest { @@ -223,8 +224,7 @@ public static String lockBoxedLong(long value) { * Reproduces issue reported in https://github.com/graalvm/graal-core/issues/201. The stamp in * the PiNode returned by {@link BoxingSnippets#longValueOf} was overwritten when the node was * subsequently canonicalized because {@code PiNode.computeValue()} ignored the - * {@link ValueNode#stamp(org.graalvm.compiler.nodes.NodeView)} field and used the - * {@code PiNode.piStamp} field. + * {@link ValueNode#stamp(NodeView)} field and used the {@code PiNode.piStamp} field. */ @Test public void test8() { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NestedExceptionHandlerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NestedExceptionHandlerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java index 352cba4ce9be..19e7f0547df2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NestedExceptionHandlerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.core.common.GraalOptions.RemoveNeverExecutedCode; -import static org.graalvm.compiler.core.common.GraalOptions.UseExceptionProbability; -import static org.graalvm.compiler.core.common.GraalOptions.UseTypeCheckHints; +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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java index f5c0e19ca5eb..4a878555da38 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewArrayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; /** * Tests the implementation of {@code [A]NEWARRAY}. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java index afbd4ea6789e..e21a640c1c4c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewInstanceTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.HashMap; import org.junit.Assert; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; /** * Tests the implementation of {@code NEW}. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java index 2b2147792962..1670df1d9076 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NewMultiArrayTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.reflect.Array; import java.lang.reflect.InvocationTargetException; @@ -30,12 +30,12 @@ import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.NewMultiArrayNode; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java index 5d8900b31464..480feab10dec 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/NullBytecodeExceptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java index fc6c42720561..40bcb8c29a72 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ObjectAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConvertNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.extended.JavaReadNode; -import org.graalvm.compiler.nodes.extended.JavaWriteNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.word.ObjectAccess; +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; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java index fb0cb5f04b17..7a12987a8c4f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PEGraphDecoderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; +import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.CompanionObjectEncoder; -import org.graalvm.compiler.nodes.EncodedGraph; -import org.graalvm.compiler.nodes.InliningLog; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.replacements.CachingPEGraphDecoder; -import org.graalvm.util.CollectionsUtil; +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 org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PointerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PointerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTest.java index bad7019ed7d0..5a8e0e833277 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PointerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTest.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConvertNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.extended.JavaReadNode; -import org.graalvm.compiler.nodes.extended.JavaWriteNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordCastNode; +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; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java index 3eb658cc4bb2..fe22b33425b9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/PointerTrackingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; - -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.word.WordCastNode; +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; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java index a57ccd727fd7..a5830cf7279c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/ReplacementsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.reflect.Executable; import java.lang.reflect.Field; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.replacements.ReplacementsImpl; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java index a0a23e2d8973..7584f58ef563 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SnippetsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.java.GraphBuilderPhase.Instance; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.ReplacementsImpl; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java index 5c38bb973633..b34b2dd51984 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StandardMethodSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.HashMap; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AbsNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.replacements.nodes.BitCountNode; -import org.graalvm.compiler.replacements.nodes.BitScanForwardNode; -import org.graalvm.compiler.replacements.nodes.BitScanReverseNode; -import org.graalvm.compiler.replacements.nodes.CountLeadingZerosNode; -import org.graalvm.compiler.replacements.nodes.CountTrailingZerosNode; -import org.graalvm.compiler.replacements.nodes.ReverseBytesNode; +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 org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompareToAVX512Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompareToAVX512Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java index cb19eaca347a..37b0615169ed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompareToAVX512Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; // JDK-8228903 diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java index 8e2664ed9d94..5d06b06407b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompareToTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.core.common.GraalOptions.RemoveNeverExecutedCode; +import static jdk.compiler.graal.core.common.GraalOptions.RemoveNeverExecutedCode; import java.util.List; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode; -import org.graalvm.compiler.serviceprovider.GraalServices; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java index 5711aca45c2f..604b3b321dc3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringCompressInflateTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java @@ -22,20 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import static org.junit.Assume.assumeTrue; import java.io.UnsupportedEncodingException; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.replacements.StringLatin1InflateNode; -import org.graalvm.compiler.replacements.StringUTF16CompressNode; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Assume; import org.junit.Before; import org.junit.Test; @@ -49,8 +50,7 @@ /** * Test intrinsic/node substitutions for (innate) methods StringLatin1.inflate and - * StringUTF16.compress provided by - * {@link org.graalvm.compiler.replacements.amd64.AMD64GraphBuilderPlugins}. + * StringUTF16.compress provided by {@link AMD64GraphBuilderPlugins}. */ @AddExports({"java.base/java.lang"}) public final class StringCompressInflateTest extends HotSpotGraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java index e04075a27ae8..bb7976e049be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringEqualsConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; +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.vm.ci.meta.JavaConstant; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringEqualsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringEqualsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java index 78b061540412..e3397f22a39b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringEqualsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; +import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; import org.junit.Test; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringGetBytesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringGetBytesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java index 16e9a63d0501..65428792576f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringGetBytesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.nio.charset.StandardCharsets; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.replacements.nodes.EncodeArrayNode; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.replacements.nodes.EncodeArrayNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java index a3fa9f507b27..ae7477da28cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringHashConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; +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.vm.ci.meta.JavaConstant; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java index 5ec0fa5b4b0b..47e03c1c9ef9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharConstantBindingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StartNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; +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 org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java index 9127ed1d90d9..42f6db803734 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfCharTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.ArrayList; import java.util.Collection; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java index 520406b2fa2e..117ec245f415 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import jdk.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.ResolvedJavaMethod; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; +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 org.junit.Test; public class StringIndexOfConstantTest extends StringIndexOfTestBase { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfDeoptimizeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfDeoptimizeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java index 55262fea28a9..459bfc260d80 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfDeoptimizeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class StringIndexOfDeoptimizeTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java index 4fee2ae54635..1b593742e675 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java index f1775ddaf421..7fe8f99c531c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIndexOfTestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.util.ArrayList; import java.util.Collection; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIntrinsicRangeChecksTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIntrinsicRangeChecksTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java index 1e623c615a9e..b46b4f6d17d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringIntrinsicRangeChecksTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; import java.util.Arrays; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.test.AddExports; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java index ea13490a2f8a..c9367131f7cf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionTestBase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.Invoke; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java index b2f5296ec082..fc302c66b993 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/StringSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; +import jdk.compiler.graal.nodes.Invoke; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.replacements.nodes.ArrayEqualsNode; import org.junit.Test; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java similarity index 73% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java index fbae7a7bf71c..6ce8646f8edc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SubstitutionNodeSourcePositionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import static org.graalvm.compiler.core.GraalCompiler.compileGraph; -import static org.graalvm.compiler.core.common.GraalOptions.TrackNodeSourcePosition; +import static jdk.compiler.graal.core.GraalCompiler.compileGraph; +import static jdk.compiler.graal.core.common.GraalOptions.TrackNodeSourcePosition; import static org.junit.Assume.assumeTrue; import java.util.List; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.SourceMapping; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.junit.Assert; import org.junit.Test; @@ -45,11 +45,10 @@ import jdk.vm.ci.meta.ResolvedJavaType; /** - * Test that various substitution implementations produce the expected - * {@link org.graalvm.compiler.graph.NodeSourcePosition} structure. Method substitutions and method - * plugins should leave behind a frame for the substitution. Method substitutions should have - * bytecodes below the substitution. Snippet lowerings should just have the bytecodes without a - * marker frame. + * Test that various substitution implementations produce the expected {@link NodeSourcePosition} + * structure. Method substitutions and method plugins should leave behind a frame for the + * substitution. Method substitutions should have bytecodes below the substitution. Snippet + * lowerings should just have the bytecodes without a marker frame. */ public class SubstitutionNodeSourcePositionTest extends ReplacementsTest { @@ -65,10 +64,10 @@ public void testSnippetLowering() { // @formatter:off // Expect mappings of the form: - // at org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.serialWriteBarrier(WriteBarrierSnippets.java:140) [bci: 18] - // at org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.serialPreciseWriteBarrier(WriteBarrierSnippets.java:158) [bci: 5] Substitution - // at org.graalvm.compiler.hotspot.replacements.WriteBarrierSnippets.serialPreciseWriteBarrier(AddressNode$Address, WriteBarrierSnippets$Counters) [bci: -1] Substitution - // at org.graalvm.compiler.replacements.test.SubstitutionNodeSourcePositionTest.snippetLowering(SubstitutionNodeSourcePositionTest.java:99) [bci: 3] + // 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] // @formatter:on // // The precise snippet bytecodes don't matter, just ensure that some actually appear after @@ -85,8 +84,8 @@ public int methodPlugin(int i) { public void testMethodPlugin() { // @formatter:off // Expect mappings of the form: - // at org.graalvm.compiler.api.directives.GraalDirectives.blackhole(int) [bci: -1] - // at org.graalvm.compiler.replacements.test.SubstitutionNodeSourcePositionTest.methodPlugin(SubstitutionNodeSourcePositionTest.java:109) [bci: 1] + // 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] // @formatter:on checkMappings("methodPlugin", false, GraalDirectives.class, "blackhole"); } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SystemArrayCopyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SystemArrayCopyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java index 95898b80cde9..e8b0d2cd28be 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/SystemArrayCopyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.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 org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java index c9e87332c50a..fa3f052b79c4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/TypeCheckTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.JavaTypeProfile; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java index ce94f2d47313..748295615350 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeBooleanAccessTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.lang.reflect.Field; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.junit.Test; public class UnsafeBooleanAccessTest extends GraalCompilerTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeObjectReplacementsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeObjectReplacementsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java index c0a3b1d0e47b..a8224ba01079 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeObjectReplacementsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.io.IOException; import java.lang.reflect.Method; -import org.graalvm.compiler.core.test.CustomizedBytecodePatternTest.CachedLoader; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.core.test.CustomizedBytecodePatternTest.CachedLoader; +import jdk.compiler.graal.test.AddExports; import org.junit.Test; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeReplacementsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeReplacementsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java index e7a8d504d8fa..fed571145002 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeReplacementsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.test.AddExports; import org.junit.Test; @AddExports("java.base/jdk.internal.misc") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java index 45533929cdb4..0b34fd42d669 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsafeSubstitutionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java index e7a082fc82d6..0148a292d30f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsignedIntegerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; /** * Tests the unsigned operations on {@link Integer} and {@link Long}. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java index 59b0bad50f17..40d65f1d14c4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnsignedMathTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; -import org.graalvm.compiler.core.common.calc.UnsignedMath; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.common.calc.UnsignedMath; +import jdk.compiler.graal.core.test.GraalCompilerTest; /** * Tests the substitutions for the {@link UnsignedMath} class. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java index 35390b4705f7..680b781dc061 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/UnwindExceptionToCallerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import org.junit.Test; -import org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; /** * Tests exception throwing from Graal compiled code. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/VarHandleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/VarHandleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java index 3974a486ea3f..96ef5854c930 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/VarHandleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.io.IOException; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.util.Objects; -import org.graalvm.compiler.core.test.SubprocessTest; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StartNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.MembarNode; -import org.graalvm.compiler.nodes.memory.MemoryKill; -import org.graalvm.compiler.nodes.memory.MultiMemoryKill; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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 org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/VectorizedHashCodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/VectorizedHashCodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java index a99ebf17ce4d..22049e0318b1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/VectorizedHashCodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; +package jdk.compiler.graal.replacements.test; import java.io.UnsupportedEncodingException; import java.util.HashSet; import java.util.Set; import java.util.function.Function; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.replacements.amd64.AMD64GraphBuilderPlugins; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.replacements.amd64.AMD64GraphBuilderPlugins; +import jdk.compiler.graal.test.AddExports; import org.junit.Test; import jdk.internal.util.ArraysSupport; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/WordTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/WordTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/WordTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/WordTest.java index 258c14540ed0..c9f82e6e73eb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/WordTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/WordTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.Builder; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.word.Word; +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; import org.graalvm.word.Pointer; import org.graalvm.word.UnsignedWord; import org.graalvm.word.WordBase; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java index 90c4bd606a40..163121565f08 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/replacements/test/classfile/ClassfileBytecodeProviderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java @@ -22,61 +22,61 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.replacements.test.classfile; - -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ANEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.BIPUSH; -import static org.graalvm.compiler.bytecode.Bytecodes.CHECKCAST; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.GETFIELD; -import static org.graalvm.compiler.bytecode.Bytecodes.GETSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.GOTO; -import static org.graalvm.compiler.bytecode.Bytecodes.GOTO_W; -import static org.graalvm.compiler.bytecode.Bytecodes.IFEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IFGE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFGT; -import static org.graalvm.compiler.bytecode.Bytecodes.IFLE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFLT; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNONNULL; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNULL; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ACMPEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ACMPNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPGE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPGT; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPLE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPLT; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPNE; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.INSTANCEOF; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEINTERFACE; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESPECIAL; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.JSR; -import static org.graalvm.compiler.bytecode.Bytecodes.JSR_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC2_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.LOOKUPSWITCH; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.MULTIANEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.NEW; -import static org.graalvm.compiler.bytecode.Bytecodes.NEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTFIELD; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.RET; -import static org.graalvm.compiler.bytecode.Bytecodes.SIPUSH; -import static org.graalvm.compiler.bytecode.Bytecodes.TABLESWITCH; +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; import java.io.File; import java.io.IOException; @@ -87,24 +87,24 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipFile; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.api.test.ModuleSupport; -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; -import org.graalvm.compiler.bytecode.BytecodeLookupSwitch; -import org.graalvm.compiler.bytecode.BytecodeStream; -import org.graalvm.compiler.bytecode.BytecodeSwitch; -import org.graalvm.compiler.bytecode.BytecodeTableSwitch; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.phases.VerifyPhase; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecode; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.test.SubprocessUtil; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddExports.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddExports.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddExports.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddExports.java index 68af4aedf295..1160ef391d4c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddExports.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddExports.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddJVM.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddJVM.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddJVM.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddJVM.java index bf536f302111..d1092a40d64c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddJVM.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddJVM.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; import java.io.IOException; import java.io.PrintStream; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddModules.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddModules.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddModules.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddModules.java index cc683317d1e2..80cab14f313d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/AddModules.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddModules.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/CommandLine.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CommandLine.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/CommandLine.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CommandLine.java index 67e276f69c5a..8a6229e999cd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/CommandLine.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CommandLine.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; import java.io.IOException; import java.io.Reader; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/CountUppercase.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CountUppercase.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/CountUppercase.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CountUppercase.java index 150c9cf1b41b..a8ee76a39b81 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/CountUppercase.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CountUppercase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; /** * A simple program that sums up the upper case letters in some text. diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/GraalTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/GraalTest.java index 6eb9316c54fe..0bb0842e67fd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/GraalTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/GraalTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; -import static org.graalvm.compiler.debug.DebugContext.NO_DESCRIPTION; +import static jdk.compiler.graal.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 org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugDumpHandler; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.GlobalMetrics; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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 org.junit.After; import org.junit.Assert; import org.junit.AssumptionViolatedException; @@ -641,4 +641,46 @@ public FileVisitResult postVisitDirectory(Path dir, IOException exc) throws IOEx } return null; } + + /** + * The declaring class, name and source file of a method as seen in a stack trace element. + */ + public record MethodSource(String className, String methodName, String fileName) { + + public boolean matches(ResolvedJavaMethod method) { + return className.equals(method.getDeclaringClass().toClassName()) && + methodName.equals(method.getName()); + } + + /** + * Creates a {@link MethodSource} for a method named {@code methodName} in + * {@code declaringClassSibling.getPackage().getName() + "." + declaringClassName}. + */ + public static MethodSource of(Class declaringClassSibling, String declaringClassName, String methodName) { + return of(declaringClassSibling.getPackage().getName() + "." + declaringClassName, methodName); + } + + /** + * Creates a {@link MethodSource} for a method named {@code methodName} in + * {@code declaringClass}. + */ + public static MethodSource of(Class declaringClass, String methodName) { + return of(declaringClass.getName(), methodName); + } + + /** + * Creates a {@link MethodSource} for a method named {@code methodName} in + * {@code declaringClass}. + */ + public static MethodSource of(String declaringClass, String methodName) { + String className = declaringClass; + int dollar = className.indexOf('$'); + String topLevelClassName = dollar != -1 ? className.substring(0, dollar) : className; + int lastPeriod = topLevelClassName.lastIndexOf('.'); + if (lastPeriod != -1) { + topLevelClassName = topLevelClassName.substring(lastPeriod + 1); + } + return new MethodSource(className, methodName, topLevelClassName + ".java"); + } + } } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/SubprocessUtil.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/SubprocessUtil.java index 4335ae2820ef..ce9fd0ff6fb7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/test/SubprocessUtil.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/SubprocessUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.test; +package jdk.compiler.graal.test; import java.io.BufferedReader; import java.io.File; @@ -42,7 +42,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.graalvm.util.CollectionsUtil; +import jdk.compiler.graal.util.CollectionsUtil; import org.junit.Assume; /** diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java index 526898b28951..dd51d35be38a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AOTSupportCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.java.MethodCallTargetNode; import org.graalvm.polyglot.Context; import org.junit.Test; import org.openjdk.jmh.annotations.TearDown; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java index 8f8b945a6667..88a25348c7c3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AbstractSplittingStrategyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.reflect.Field; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AddExports.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AddExports.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AddExports.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AddExports.java index da4d993a0958..b0a7d4638fb5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AddExports.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AddExports.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java index bef852090be0..0f2d105d207d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AgnosticInliningPhaseTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.truffle.compiler.PartialEvaluator; -import org.graalvm.compiler.truffle.compiler.PostPartialEvaluationSuite; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; -import org.graalvm.compiler.truffle.compiler.TruffleTierContext; -import org.graalvm.compiler.truffle.compiler.phases.inlining.AgnosticInliningPhase; +import jdk.compiler.graal.core.common.CompilationIdentifier; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.truffle.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase; import org.graalvm.polyglot.Context; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java index 45f7669ff2f0..bede2236bf87 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AllocationReporterPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java index 2b63bb9a860b..86920f7c6f6d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsIndexOfWithMaskTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.api.test.ArrayUtilsTest.toByteArray; import static com.oracle.truffle.api.test.ArrayUtilsTest.toCharArray; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java index 1d405144cfc1..180eea974fe2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins; +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.compiler.substitutions.TruffleInvocationPlugins; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java index a8b32f4590d4..434eb8d7017e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.api.test.ArrayUtilsTest.toByteArray; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java index 94da396e792b..61d8ad1424e2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ArrayUtilsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.ArrayList; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java index 24764dde6da0..5182461ea68f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AssumedValuePartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AssumptionPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AssumptionPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java index c82983f659f4..b7d00808c70b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/AssumptionPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.ref.WeakReference; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.AssumptionCutsBranchTestNode; -import org.graalvm.compiler.truffle.test.nodes.ConstantWithAssumptionTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +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 org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BailoutPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BailoutPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java index 87088bc4336e..c6702e7d4d1c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BailoutPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BeginNodeOptimizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BeginNodeOptimizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java index b770c0460d46..5f35d77ada58 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BeginNodeOptimizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.function.Supplier; import java.util.stream.IntStream; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.nodes.BeginNode; +import jdk.compiler.graal.graph.Graph; +import jdk.compiler.graal.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(org.graalvm.compiler.graph.Node node) { + public void nodeAdded(jdk.compiler.graal.graph.Node node) { if (node instanceof BeginNode) { beginCount++; } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java index 3ac7b9fc32d8..f0f2ae8469cf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BytecodeInterpreterPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.ArrayList; import java.util.Formatter; import java.util.List; import java.util.Map; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.MetricKey; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java index 3c602db3cf5c..a3d59ef25f35 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/BytecodeOSRNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.test.GraalTest; +import jdk.compiler.graal.test.GraalTest; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CachedLibraryCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CachedLibraryCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java index d6986a0a75b0..ee88098de1a9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CachedLibraryCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.truffle.test.CachedLibraryCompilationTestFactory.FrameNodeGen; -import org.graalvm.compiler.truffle.test.CachedLibraryCompilationTestFactory.GuardNodeGen; -import org.graalvm.compiler.truffle.test.CachedLibraryCompilationTestFactory.NoGuardNodeGen; -import org.graalvm.compiler.truffle.test.CachedLibraryCompilationTestFactory.VarArgsLibraryNodeGen; +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; import org.graalvm.polyglot.Context; import org.junit.After; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java index ab22fbba6362..28eddb9db05b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CastExactPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.nio.BufferOverflowException; import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java index 42b51267d7cc..f93407ec28db 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CodeInvalidationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.IOException; import java.util.concurrent.CountDownLatch; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationFinalPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationFinalPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java index 6cc60aae3f1d..19d2206bec81 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationFinalPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.api.CompilerAsserts.partialEvaluationConstant; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Test; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java index e197be134770..3ff518e0da93 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.ref.WeakReference; import java.util.function.IntSupplier; import java.util.stream.IntStream; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java index 29abca34d896..2abc24b60e94 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilationMemoryTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.ref.Reference; import java.lang.ref.WeakReference; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerAssertsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerAssertsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java index 1e9e7e18e58c..633ab8a29a99 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerAssertsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.BoxNode; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.ConstantTestNode; -import org.graalvm.compiler.truffle.test.nodes.NonConstantTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +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; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerDirectivesTypeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerDirectivesTypeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java index 221c86765d35..adb7dfcf4a77 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerDirectivesTypeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider; +import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerInitializationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerInitializationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java index 9d94c90e5ada..29ae51b7c64c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerInitializationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java index 9927096d591a..a0168a6fb9d6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerLoggingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.debug.TTY; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerOptionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerOptionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java index 339e83d3d394..8f110eafab3f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/CompilerOptionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ConditionAnchoringTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ConditionAnchoringTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java index dfdc2ca3432e..b2abf89d8f17 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ConditionAnchoringTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableCount.hasCount; -import static org.graalvm.compiler.graph.test.matchers.NodeIterableIsEmpty.isEmpty; -import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo; +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 org.hamcrest.core.IsInstanceOf.instanceOf; import static org.junit.Assert.assertThat; import java.lang.reflect.Field; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.ConditionAnchorNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.LoweringPhase; -import org.graalvm.compiler.truffle.compiler.nodes.ObjectLocationIdentity; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +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.compiler.nodes.ObjectLocationIdentity; +import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; import org.junit.Test; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java index bbc580aa67fd..dfc700a17a96 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ContextLookupCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertSame; @@ -35,9 +35,9 @@ import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.memory.ReadNode; +import jdk.compiler.graal.nodes.FieldLocationIdentity; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.memory.ReadNode; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; import org.graalvm.word.LocationIdentity; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java index 4fc3cc8591d8..0f4113a0dd99 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ControlFlowExceptionPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java index 52fd5af2b280..eb3b5be45147 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DFAPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DefaultLoomTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DefaultLoomTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java index 537d2bf74727..a48770b04a40 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DefaultLoomTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DeoptInvalidateListener.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DeoptInvalidateListener.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java index 52b00cb1b89b..d710a63eb271 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DeoptInvalidateListener.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import com.oracle.truffle.api.frame.Frame; import com.oracle.truffle.runtime.AbstractGraalTruffleRuntimeListener; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DynamicObjectPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DynamicObjectPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java index 977224ffadbc..54459acefd47 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/DynamicObjectPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.extended.UnsafeAccessNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.truffle.compiler.nodes.ObjectLocationIdentity; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +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.compiler.nodes.ObjectLocationIdentity; import org.junit.Assert; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java index 20063c60ba0d..5ea3c57118d0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EncodedGraphCacheTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.EncodedGraph; -import org.graalvm.compiler.truffle.compiler.PartialEvaluator; -import org.graalvm.compiler.truffle.compiler.TruffleCompilation; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.debug.DebugContext; +import jdk.compiler.graal.nodes.EncodedGraph; +import jdk.compiler.graal.truffle.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.compiler.TruffleCompilation; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java index a886dfafe18d..342a0ad5e7d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EngineModeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EnumPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EnumPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java index 270655f25ea6..8fff9c0401ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/EnumPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExactMathTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExactMathTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java index 4417871fc2f4..16ea367864ff 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExactMathTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.calc.RoundNode; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; +import jdk.compiler.graal.nodes.calc.RoundNode; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java index c93c2e7c9087..e84d99da0c13 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExceptionActionTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExecutionListenerCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExecutionListenerCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java index 5a697974333b..938d8e701b37 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExecutionListenerCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.function.Consumer; import java.util.function.Supplier; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExitDuringCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExitDuringCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java index 03ba912f2009..1e6495869779 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExitDuringCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import com.oracle.truffle.api.nodes.RootNode; import com.oracle.truffle.api.test.SubprocessTestUtils; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java index e3ce5495c1e4..3d6b41d9976d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ExplodeLoopBlockDuplicationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FinalBitSetCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FinalBitSetCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java index ea43e9c4cdae..8f11a48f0d1c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FinalBitSetCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java index 12e5e2f52067..1ee5d2b0a4ca 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FlushEngineQueueTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertNotEquals; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameAccessVerificationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameAccessVerificationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java index 0e3ea5006820..5e2c9e568247 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameAccessVerificationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java @@ -23,21 +23,21 @@ * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.function.Consumer; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.NarrowNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.java.AbstractNewObjectNode; -import org.graalvm.compiler.nodes.java.ExceptionObjectNode; -import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameDescriptorTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameDescriptorTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java index 0da3943f1386..80b9773599a3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameDescriptorTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.ConstantNode; +import jdk.compiler.graal.nodes.ReturnNode; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameHostReadsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameHostReadsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java index 1dcd548e14a0..b5c34bd21510 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/FrameHostReadsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.memory.ReadNode; +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 org.graalvm.word.LocationIdentity; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GR35581Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GR35581Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java index e0f22dc08ac7..ef05fdd0deb2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GR35581Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GR36613Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GR36613Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java index 5fda6c5fc99d..042ab9a231e3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GR36613Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GenerateInlineCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GenerateInlineCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java index b7546e4c0a1d..160c6a41d28e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GenerateInlineCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.truffle.test.GenerateInlineCompilationTestFactory.CustomNodeGen; -import org.graalvm.compiler.truffle.test.GenerateInlineCompilationTestFactory.TestChildrenNodeGen; -import org.graalvm.compiler.truffle.test.GenerateInlineCompilationTestFactory.TestDimensionsRootNodeGen; -import org.graalvm.compiler.truffle.test.GenerateInlineCompilationTestFactory.UseProfilesNodeGen; +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 org.junit.Test; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GetRootNodeCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GetRootNodeCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java index 112f9fde5fc0..9faf9b9f8938 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GetRootNodeCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import static org.graalvm.compiler.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount; +import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.common.PermanentBailoutException; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.options.OptionValues; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java index 12bc13bd4411..6c214e308671 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/GraalTruffleRuntimeListenerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HashCodeIntrinsicTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HashCodeIntrinsicTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java index 16b7b4f4ba68..f7ee6cbfe90a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HashCodeIntrinsicTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.StructuredGraph; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningBytecodeInterpreterExampleTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningBytecodeInterpreterExampleTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java index 5e3c846a40ed..9f5a8cfd7324 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningBytecodeInterpreterExampleTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningBytecodeInterpreterTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningBytecodeInterpreterTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java index 25ba8c5a5d35..d1abf49ddbb2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningBytecodeInterpreterTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.OptionValues; +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; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java index 779c12eab85c..8882b7ea5f94 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/HostInliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.phases.HighTier; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.truffle.compiler.host.HostInliningPhase; -import org.graalvm.compiler.truffle.test.HostInliningTestFactory.IfNodeGen; +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.compiler.host.HostInliningPhase; +import jdk.compiler.graal.truffle.test.HostInliningTestFactory.IfNodeGen; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.BeforeClass; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java index d0c4bfbd0b5c..2f8c492f5544 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/IndirectCallSiteTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java index 2f0973e05126..e4168b579540 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/InstrumentBranchesPhaseTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.truffle.compiler.PartialEvaluator; -import org.graalvm.compiler.truffle.compiler.phases.InstrumentPhase; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; @@ -102,7 +102,7 @@ public void simpleIfTest() { Assert.assertTrue(target.isValid()); target.call(); String stackOutput = instrumentation.accessTableToList().get(0); - Assert.assertTrue(stackOutput, stackOutput.contains("org.graalvm.compiler.truffle.test.InstrumentBranchesPhaseTest$SimpleIfTestNode.execute(InstrumentBranchesPhaseTest.java")); + assertStack(stackOutput, MethodSource.of(SimpleIfTestNode.class, "execute")); Assert.assertTrue(stackOutput, stackOutput.contains(String.format("[bci: 4]%n[0] state = ELSE(if=0#, else=1#)"))); String histogramOutput = instrumentation.accessTableToHistogram().get(0); Assert.assertEquals(" 0: ********************************************************************************", histogramOutput); @@ -136,10 +136,15 @@ public void twoIfsTest() { target.call(); InstrumentPhase.Instrumentation instrumentation = getInstrumentation(target); String stackOutput1 = instrumentation.accessTableToList().get(0); - Assert.assertTrue(stackOutput1, stackOutput1.contains("org.graalvm.compiler.truffle.test.InstrumentBranchesPhaseTest$TwoIfsTestNode.execute(InstrumentBranchesPhaseTest.java")); + assertStack(stackOutput1, MethodSource.of(TwoIfsTestNode.class, "execute")); Assert.assertTrue(stackOutput1, stackOutput1.contains(String.format("[bci: 4]%n[0] state = ELSE(if=0#, else=2#)"))); String stackOutput2 = instrumentation.accessTableToList().get(1); - Assert.assertTrue(stackOutput2, stackOutput2.contains("org.graalvm.compiler.truffle.test.InstrumentBranchesPhaseTest$TwoIfsTestNode.execute(InstrumentBranchesPhaseTest.java")); + assertStack(stackOutput2, MethodSource.of(TwoIfsTestNode.class, "execute")); Assert.assertTrue(stackOutput2, stackOutput2.contains(String.format("[bci: 18]%n[1] state = IF(if=2#, else=0#)"))); } + + static void assertStack(String stackOutput, MethodSource element) { + String expect = String.format("%s.%s(%s", element.className(), element.methodName(), element.fileName()); + Assert.assertTrue(stackOutput, stackOutput.contains(expect)); + } } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/InstrumentationCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/InstrumentationCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java index b07be756cbe7..35871f52fb75 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/InstrumentationCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java index dfbbb38f013c..26077a963362 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LanguageContextFreedTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTargetNegativeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTargetNegativeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java index 28c6e6816fc5..70971da18d6c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTargetNegativeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.truffle.test.LazyInitializationTest. + * This test is used indirectly by jdk.compiler.graal.truffle.test.LazyInitializationTest. */ public class LazyClassLoadingTargetNegativeTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTargetPositiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTargetPositiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java index 0e6b7a2f91a9..81cdf739481c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTargetPositiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.truffle.test.LazyInitializationTest. + * This test is used indirectly by jdk.compiler.graal.truffle.test.LazyInitializationTest. */ public class LazyClassLoadingTargetPositiveTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java index a104cb06983f..12705d35133f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LazyClassLoadingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.CompileImmediately; -import static org.graalvm.compiler.test.SubprocessUtil.getVMCommandLine; -import static org.graalvm.compiler.test.SubprocessUtil.withoutDebuggerArguments; +import static jdk.compiler.graal.test.SubprocessUtil.getVMCommandLine; +import static jdk.compiler.graal.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 org.graalvm.compiler.core.CompilerThreadFactory; -import org.graalvm.compiler.core.GraalCompilerOptions; -import org.graalvm.compiler.core.common.util.Util; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.hotspot.CommunityCompilerConfigurationFactory; -import org.graalvm.compiler.hotspot.CompilerConfigurationFactory; -import org.graalvm.compiler.hotspot.EconomyCompilerConfigurationFactory; -import org.graalvm.compiler.hotspot.HotSpotGraalVMEventListener; -import org.graalvm.compiler.nodes.Cancellable; -import org.graalvm.compiler.options.OptionDescriptor; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.test.SubprocessUtil.Subprocess; +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 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("org.graalvm.compiler.hotspot.HotSpotGraalCompilerFactory$Options"); - hotSpotGraalJVMCIServiceLocatorShared = forNameOrNull("org.graalvm.compiler.hotspot.HotSpotGraalJVMCIServiceLocator$Shared"); - jvmciVersionCheck = forNameOrNull("org.graalvm.compiler.hotspot.JVMCIVersionCheck"); + hotSpotGraalCompilerFactoryOptions = forNameOrNull("jdk.compiler.graal.hotspot.HotSpotGraalCompilerFactory$Options"); + hotSpotGraalJVMCIServiceLocatorShared = forNameOrNull("jdk.compiler.graal.hotspot.HotSpotGraalJVMCIServiceLocator$Shared"); + jvmciVersionCheck = forNameOrNull("jdk.compiler.graal.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("org.graalvm.compiler.truffle.") || className.startsWith("org.graalvm.compiler.serviceprovider.")) { + if (className.startsWith("jdk.compiler.graal.truffle.") || className.startsWith("jdk.compiler.graal.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("org.graalvm.compiler."); + return className.startsWith("jdk.compiler.graal."); } } @@ -257,7 +257,7 @@ private boolean isGraalClassAllowed(Class cls) { return true; } - if (JVMCICompilerFactory.class.isAssignableFrom(cls) || cls.getName().startsWith("org.graalvm.compiler.hotspot.IsGraalPredicate")) { + if (JVMCICompilerFactory.class.isAssignableFrom(cls) || cls.getName().startsWith("jdk.compiler.graal.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("org.graalvm.compiler.hotspot.HotSpotGraalOptionValues")) { + cls.getName().equals("jdk.compiler.graal.hotspot.HotSpotGraalOptionValues")) { // Classes implementing Graal option loading return true; } @@ -282,7 +282,7 @@ private boolean isGraalClassAllowed(Class cls) { return true; } - if (cls.getName().equals("org.graalvm.compiler.hotspot.HotSpotGraalMBean")) { + if (cls.getName().equals("jdk.compiler.graal.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 org.graalvm.compiler package should be loaded. + // No other class from the jdk.compiler.graal. package should be loaded. return false; } } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibraryCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibraryCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java index 103889e87531..b7627d414afb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibraryCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibraryInheritanceCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibraryInheritanceCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java index 4db69ff1a2ca..d5231ae5f646 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibraryInheritanceCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.truffle.test.LibraryInheritanceCompilationTestFactory.CompilationConstantRootNodeGen; +import jdk.compiler.graal.truffle.test.LibraryInheritanceCompilationTestFactory.CompilationConstantRootNodeGen; import org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java index c79dd686adc7..8464900546ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LibrarySplittingStrategyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Before; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoomUtils.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoomUtils.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java index 5b73983119f0..a59cb8cacc07 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoomUtils.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; public class LoomUtils { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java index 047c16ad0d8a..bc8f078a55df 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoopNodeOSRTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.stream.IntStream; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java index bba78a82b30d..2906251bec5a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/LoopNodePartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.List; import java.util.stream.Stream; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.ProfileData.ProfileSource; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; +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 org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java index 1f7edc447da8..71cb1243d7e8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MaterializedFrameTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; +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 org.junit.Test; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java index dae4019dec0a..40553707583d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MergeExplodeProxyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.ProxyNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.util.GraphOrder; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MultiTierAssumptionInvalidationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MultiTierAssumptionInvalidationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java index c53897c1e89b..da525585082c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MultiTierAssumptionInvalidationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java index f6eed1e6c0be..9cd7fb5b534d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/MultiTierCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.FirstTierCompilationThreshold; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.LastTierCompilationThreshold; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLibraryCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLibraryCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java index 91fea8850cd7..d232c46c1dfb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLibraryCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java @@ -22,9 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import static org.graalvm.compiler.truffle.test.InstrumentationCompilerTest.DUMMY_SECTION; +package jdk.compiler.graal.truffle.test; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; @@ -93,7 +91,7 @@ private RootNode createRoot(FrameDescriptor frameDescriptor, InstrumentationComp @Override public SourceSection getSourceSection() { - return DUMMY_SECTION; + return InstrumentationCompilerTest.DUMMY_SECTION; } @Override @@ -116,7 +114,7 @@ abstract static class InstrumentationCompilerTestScopeNode extends Node implemen @Override public SourceSection getSourceSection() { - return DUMMY_SECTION; + return InstrumentationCompilerTest.DUMMY_SECTION; } @Override diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLibrarySLCompilerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLibrarySLCompilerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java index d126ff1d33f0..85e7969d1b61 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLibrarySLCompilerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java index ac4bf235e78f..b48b09f87e04 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeLimitTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.function.Function; import java.util.function.Supplier; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.contract.NodeCostUtil; +import jdk.compiler.graal.core.common.PermanentBailoutException; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.phases.contract.NodeCostUtil; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Assume; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java index 8962c59b1a81..0300d6117ec4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/NodeSplittingStrategyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.graalvm.polyglot.Context; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java index 513c529210b5..4e1f13ab6765 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OSRCancelTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java index 539883336245..e54ab622aeb6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.Objects; -import org.graalvm.compiler.truffle.test.ObjectsRequireNonNullPartialEvaluationTest.TestClass.InnerClass; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +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 org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java index bc965e8e9d69..d147a6809d02 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedBlockNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.test.SubprocessUtil; +import jdk.compiler.graal.test.SubprocessUtil; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Value; import org.junit.After; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java index 32ef40671f32..1516ea4c6b61 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedCallTargetTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.ConstantTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +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 org.junit.Assert; import org.junit.Ignore; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedLoomTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedLoomTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java index ec1681f2c124..db665add4eef 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedLoomTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java index a0510040f601..3ececee62417 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OptimizedOSRLoopNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.MinInvokeThreshold; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.OSRCompilationThreshold; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java index 482b23d3c037..c32afc4a0f36 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/OverrideOptionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.graalvm.options.OptionValues; import org.graalvm.polyglot.Context; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java index 6002bd21cc3e..fa109ae4c6d2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; +import static jdk.compiler.graal.core.common.CompilationRequestIdentifier.asCompilationRequest; +import static jdk.compiler.graal.debug.DebugOptions.DumpOnError; import java.util.Set; import java.util.function.Supplier; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DynamicDeoptimizeNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.truffle.compiler.PartialEvaluator; -import org.graalvm.compiler.truffle.compiler.PerformanceInformationHandler; -import org.graalvm.compiler.truffle.compiler.TruffleCompilation; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; -import org.graalvm.compiler.truffle.compiler.TruffleDebugJavaMethod; -import org.graalvm.compiler.truffle.compiler.TruffleTierContext; -import org.graalvm.compiler.truffle.compiler.phases.TruffleTier; +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.compiler.PartialEvaluator; +import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler; +import jdk.compiler.graal.truffle.compiler.TruffleCompilation; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod; +import jdk.compiler.graal.truffle.compiler.TruffleTierContext; +import jdk.compiler.graal.truffle.compiler.phases.TruffleTier; import org.junit.Assert; import com.oracle.truffle.api.CallTarget; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java index 15b4d720459e..ddae1cd5d50a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PerformanceWarningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.ByteArrayOutputStream; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.truffle.compiler.TruffleCompilation; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.debug.DebugCloseable; +import jdk.compiler.graal.debug.DebugContext; +import jdk.compiler.graal.debug.DebugContext.Builder; +import jdk.compiler.graal.truffle.compiler.TruffleCompilation; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java index 1e2eb103aa8f..1950149f6bbd 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PhiStampInferencePartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.function.Supplier; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Test; import com.oracle.truffle.api.RootCallTarget; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PhiTransformTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PhiTransformTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java index 6717fa58ff84..36e8037398ce 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PhiTransformTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java @@ -23,27 +23,27 @@ * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.ListIterator; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.calc.NarrowNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.truffle.compiler.nodes.AnyExtendNode; -import org.graalvm.compiler.truffle.compiler.phases.PhiTransformPhase; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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.compiler.nodes.AnyExtendNode; +import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase; +import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java index 5ebec2955489..3f1a4cf2c14e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PolyglotEngineOptionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import com.oracle.truffle.sl.runtime.SLStrings; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PolyglotHostObjectPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PolyglotHostObjectPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java index 82538d423d03..0ca2547fb680 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PolyglotHostObjectPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.interop.InteropLibrary; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java index c6db218df1f2..0c6e44adafbe 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.function.Function; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ResourceLimitsCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ResourceLimitsCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java index acdc9956ab06..36ce1067fe48 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ResourceLimitsCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.concurrent.Semaphore; import java.util.function.Predicate; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode; -import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndAddNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; +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 org.graalvm.polyglot.Context; import org.graalvm.polyglot.Engine; import org.graalvm.polyglot.ResourceLimits; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java index 4a2f6652ac90..f6b6fa513f2a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/RewriteDuringCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.test.GraalCompilerTest; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Source; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SLCompileImmediatelyTestSuite.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SLCompileImmediatelyTestSuite.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java index e866b7d6430f..e0decf3a5ffc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SLCompileImmediatelyTestSuite.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SLTruffleGraalTestSuite.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SLTruffleGraalTestSuite.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java index ca9d1841dc71..a24cf0f0323b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SLTruffleGraalTestSuite.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.truffle.test.builtins.SLAssertFalseBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLAssertTrueBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLCallFunctionsWithBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLCallUntilOptimizedBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLDeoptimizeWhenCompiledBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLDisableSplittingBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLGetOptionBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLIsCompilationConstantBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLIsOptimizedBuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLTestTruffleBoundary01BuiltinFactory; -import org.graalvm.compiler.truffle.test.builtins.SLWaitForOptimizationBuiltinFactory; +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 org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SafepointRethrowDeoptPETest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SafepointRethrowDeoptPETest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java index a7c17147eb05..ab5871e0edd7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SafepointRethrowDeoptPETest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java @@ -22,11 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.concurrent.CountDownLatch; -import org.graalvm.compiler.core.common.GraalOptions; +import jdk.compiler.graal.core.test.GraalCompilerTest; +import jdk.compiler.graal.core.common.GraalOptions; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; @@ -188,7 +189,7 @@ public Object execute(VirtualFrame frame) { @Test public void test() { - Assume.assumeTrue(GraalOptions.GenLoopSafepoints.getValue(getInitialOptions())); + Assume.assumeTrue(GraalOptions.GenLoopSafepoints.getValue(GraalCompilerTest.getInitialOptions())); synchronized (SafepointRethrowDeoptPETest.class) { // safeguard static fields testInner(new Test0RootNode()); testInner(new Test1RootNode()); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java index 878c8fb073d6..16e9f29ccd5b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/SimplePartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java @@ -22,43 +22,44 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.core.common.GraalBailoutException; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.PEGraphDecoder; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.AddTestNode; -import org.graalvm.compiler.truffle.test.nodes.BlockTestNode; -import org.graalvm.compiler.truffle.test.nodes.ConstantTestNode; -import org.graalvm.compiler.truffle.test.nodes.ExplodeLoopUntilReturnNode; -import org.graalvm.compiler.truffle.test.nodes.ExplodeLoopUntilReturnWithThrowNode; -import org.graalvm.compiler.truffle.test.nodes.InliningNullCheckNode1; -import org.graalvm.compiler.truffle.test.nodes.InliningNullCheckNode2; -import org.graalvm.compiler.truffle.test.nodes.LambdaTestNode; -import org.graalvm.compiler.truffle.test.nodes.LoadLocalTestNode; -import org.graalvm.compiler.truffle.test.nodes.LoopTestNode; -import org.graalvm.compiler.truffle.test.nodes.NeverPartOfCompilationTestNode; -import org.graalvm.compiler.truffle.test.nodes.ObjectEqualsNode; -import org.graalvm.compiler.truffle.test.nodes.ObjectHashCodeNode; -import org.graalvm.compiler.truffle.test.nodes.PartialIntrinsicNode; -import org.graalvm.compiler.truffle.test.nodes.RecursionTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; -import org.graalvm.compiler.truffle.test.nodes.StoreLocalTestNode; -import org.graalvm.compiler.truffle.test.nodes.StringEqualsNode; -import org.graalvm.compiler.truffle.test.nodes.StringHashCodeFinalNode; -import org.graalvm.compiler.truffle.test.nodes.StringHashCodeNonFinalNode; -import org.graalvm.compiler.truffle.test.nodes.SynchronizedExceptionMergeNode; -import org.graalvm.compiler.truffle.test.nodes.UnrollLoopUntilReturnNode; -import org.graalvm.compiler.truffle.test.nodes.UnrollLoopUntilReturnWithThrowNode; -import org.graalvm.compiler.truffle.test.nodes.explosion.LoopExplosionPhiNode; -import org.graalvm.compiler.truffle.test.nodes.explosion.NestedExplodedLoopTestNode; -import org.graalvm.compiler.truffle.test.nodes.explosion.TwoMergesExplodedLoopTestNode; -import org.graalvm.compiler.truffle.test.nodes.explosion.UnrollingTestNode; +package jdk.compiler.graal.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 org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; @@ -112,16 +113,20 @@ public void neverPartOfCompilationTest() { // Expected verification error occurred. StackTraceElement[] trace = t.getStackTrace(); if (getTruffleCompiler(null).getPartialEvaluator().getGraphBuilderConfigForParsing().trackNodeSourcePosition() || GraalOptions.TrackNodeSourcePosition.getValue(getInitialOptions())) { - assertStack(trace[0], "com.oracle.truffle.api.CompilerAsserts", "neverPartOfCompilation", "CompilerAsserts.java"); - assertStack(trace[1], "org.graalvm.compiler.truffle.test.nodes.NeverPartOfCompilationTestNode", "execute", "NeverPartOfCompilationTestNode.java"); - assertStack(trace[2], "org.graalvm.compiler.truffle.test.nodes.RootTestNode", "execute", "RootTestNode.java"); + assertStack(trace[0], MethodSource.of(CompilerAsserts.class, "neverPartOfCompilation")); + assertStack(trace[1], MethodSource.of(NeverPartOfCompilationTestNode.class, "execute")); + assertStack(trace[2], MethodSource.of(RootTestNode.class, "execute")); } else { - assertStack(trace[0], "org.graalvm.compiler.truffle.test.nodes.NeverPartOfCompilationTestNode", "execute", "NeverPartOfCompilationTestNode.java"); - assertStack(trace[1], "org.graalvm.compiler.truffle.test.nodes.RootTestNode", "execute", "RootTestNode.java"); + assertStack(trace[0], MethodSource.of(NeverPartOfCompilationTestNode.class, "execute")); + assertStack(trace[1], MethodSource.of(RootTestNode.class, "execute")); } } } + static void assertStack(StackTraceElement stack, MethodSource element) { + assertStack(stack, element.className(), element.methodName(), element.fileName()); + } + private static void assertStack(StackTraceElement stack, String className, String methodName, String fileName) { Assert.assertEquals(className, stack.getClassName()); Assert.assertEquals(methodName, stack.getMethodName()); diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/StaticObjectCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/StaticObjectCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java index ddf52e9b7a9c..8640a8c6a9cb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/StaticObjectCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.Closeable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; -import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode; +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 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 (org.graalvm.compiler.graph.Node node : graph.getNodes()) { + private static void assertNoNodes(StructuredGraph graph, Class nodeClass) { + for (jdk.compiler.graal.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.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/StringNodeInliningCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/StringNodeInliningCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java index e60eab932975..3437a966bba5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/StringNodeInliningCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assume.assumeFalse; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TestWithPolyglotOptions.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TestWithPolyglotOptions.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java index 350d1ac99fb4..1b64e2dbee90 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TestWithPolyglotOptions.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.graalvm.polyglot.Context; import org.graalvm.polyglot.Context.Builder; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TestWithSynchronousCompiling.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TestWithSynchronousCompiling.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java index 63501e0604a3..6b74d217e383 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TestWithSynchronousCompiling.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java index 1ec41cf25011..d992a67a77b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/ThreadsActivationCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertTrue; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java index e0b9150f7990..a7d3aac1ba6f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TraceCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.serviceprovider.GraalServices; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java index 5495aa68947f..475afa0460df 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TransferToInterpreterTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java index c0b8314a3f3d..6ad1e2b84583 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryExceptionsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static com.oracle.truffle.runtime.OptimizedRuntimeOptions.SingleTierCompilationThreshold; import static org.junit.Assert.assertEquals; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java index 945ea6518995..d3b27929b475 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleBoundaryInliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.Iterator; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.Invoke; +import jdk.compiler.graal.nodes.StructuredGraph; import org.junit.Test; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java index 243c1a47e2fa..dce997e85277 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleCompilerImplTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.concurrent.atomic.AtomicBoolean; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.core.test.GraalCompilerTest; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes; -import org.graalvm.compiler.truffle.compiler.TruffleCompilation; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; +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.compiler.KnownTruffleTypes; +import jdk.compiler.graal.truffle.compiler.TruffleCompilation; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; import org.graalvm.polyglot.Context; import org.junit.After; import org.junit.Assume; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java index d52b22a7443b..5289528025ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleContextCompilationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java index a4c1aeab4010..9ce8dec08fd0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleDirectCallNodeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertNotSame; import static org.junit.Assert.assertSame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleEnsureVirtualizedTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleEnsureVirtualizedTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java index 1c53a2606e9f..b870c30faa93 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleEnsureVirtualizedTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.api.directives.GraalDirectives; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java index 78b6aef814a2..193be03b1bb9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleExceptionPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Test; import com.oracle.truffle.api.CallTarget; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleHostInliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleHostInliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java index decba035e62f..3fe58ca5e007 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleHostInliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.File; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleLoggerPartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleLoggerPartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java index 600077ad2c23..a451fbea60d8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleLoggerPartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java @@ -22,13 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import com.oracle.truffle.api.frame.FrameDescriptor; import java.util.logging.Level; -import org.graalvm.compiler.truffle.test.nodes.IsLoggableNode; -import org.graalvm.compiler.truffle.test.nodes.LoggingNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; + +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 org.junit.Test; public class TruffleLoggerPartialEvaluationTest extends PartialEvaluationTest { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleOptionsByClassLoaderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleOptionsByClassLoaderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java index 8d4490fa3898..3a3a04539ecb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleOptionsByClassLoaderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java index 0a75468e0e3e..28416a8be845 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleReturnBoxedParameterTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.truffle.test.TruffleReturnBoxedParameterTestFactory.IntNodeFactory; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.extended.ForeignCallNode; +import jdk.compiler.graal.truffle.test.TruffleReturnBoxedParameterTestFactory.IntNodeFactory; import org.junit.Test; import com.oracle.truffle.api.dsl.GenerateNodeFactory; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleRuntimeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleRuntimeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java index 344218e98c70..6c9c4436e948 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleRuntimeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.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 org.graalvm.compiler.api.test.Graal; -import org.graalvm.compiler.runtime.RuntimeProvider; +import jdk.compiler.graal.api.test.Graal; +import jdk.compiler.graal.runtime.RuntimeProvider; import org.junit.Test; import com.oracle.truffle.api.Truffle; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleShutdownHookTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleShutdownHookTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java index e61fcee16742..4ee74b0b54dc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleShutdownHookTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java index c7c413de695c..add853e74f47 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.UnwindNode; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.UnwindNode; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleValueTypeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleValueTypeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java index 005c494820a1..5e340b12a08d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/TruffleValueTypeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; - -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.VirtualizableAllocation; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; +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; import org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java index 4e1c45a6ae95..ccdabead7f7e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/UnrollLoopBlockDuplicationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/VarHandlePartialEvaluationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/VarHandlePartialEvaluationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java index db09d9a7e13e..7532d89335d7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/VarHandlePartialEvaluationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test; +package jdk.compiler.graal.truffle.test; import java.lang.invoke.MethodHandles; import java.lang.invoke.VarHandle; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; -import org.graalvm.compiler.truffle.test.nodes.RootTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.RootTestNode; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertFalseBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertFalseBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java index 161043307672..98bf1aac578f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertFalseBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Cached; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertTrueBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertTrueBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java index 6e991a15e37d..163267cd0180 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertTrueBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Cached; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertionError.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertionError.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java index 2bf18e23354d..1212faea154d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLAssertionError.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.nodes.Node; import com.oracle.truffle.sl.SLException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLCallFunctionsWithBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLCallFunctionsWithBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java index 9adc1a5b2094..625b1c0a9c22 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLCallFunctionsWithBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.Truffle; import com.oracle.truffle.api.dsl.Cached; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java index 21a99980d20d..1bd6537b3fe7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.Truffle; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java index 90c1948a7d7f..b24845ffefed 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLDisableSplittingBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLDisableSplittingBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java index de0a6995d622..808ede290078 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLDisableSplittingBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.Truffle; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLGetOptionBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLGetOptionBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java index 94ca268257cf..36a6c9406304 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLGetOptionBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import org.graalvm.options.OptionDescriptor; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLGraalRuntimeBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLGraalRuntimeBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java index 6a3237886ba5..3e7213a62d35 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLGraalRuntimeBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import java.util.HashSet; import java.util.Set; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLIsCompilationConstantBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLIsCompilationConstantBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java index 899bc22adb64..0c123c81c2b7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLIsCompilationConstantBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives; import com.oracle.truffle.api.dsl.Specialization; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLIsOptimizedBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLIsOptimizedBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java index de3a8898d506..0bdf1ba50908 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLIsOptimizedBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.dsl.Specialization; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java index 2ef8afaed875..5d9a1f7e5562 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import java.util.concurrent.Callable; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLWaitForOptimizationBuiltin.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLWaitForOptimizationBuiltin.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java index 003b62e5f52d..86bd74685545 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/builtins/SLWaitForOptimizationBuiltin.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.builtins; +package jdk.compiler.graal.truffle.test.builtins; import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/collection/BTreeQueueTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/collection/BTreeQueueTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java index bcd2c1cf4844..03ca2d1f5d5d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/collection/BTreeQueueTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.collection; +package jdk.compiler.graal.truffle.test.collection; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/collection/DelegatingBlockingQueueTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/collection/DelegatingBlockingQueueTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java index ab5a952b5c64..1eed570a70b9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/collection/DelegatingBlockingQueueTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.collection; +package jdk.compiler.graal.truffle.test.collection; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java index a408d1048ad5..9fa7bafb51b8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/inlining/InlineOnlyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.truffle.test.inlining; +package jdk.compiler.graal.truffle.test.inlining; import org.graalvm.polyglot.Context; import org.junit.Assert; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java index 0d18709e7f69..ff8283a8a820 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/inlining/InliningTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.inlining; +package jdk.compiler.graal.truffle.test.inlining; import org.graalvm.polyglot.Context; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java index 46a724e8f6ba..fdb3c606c6f0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/libgraal/JNIExceptionWrapperTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.libgraal; +package jdk.compiler.graal.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 org.graalvm.compiler.core.CompilationWrapper; -import org.graalvm.compiler.core.GraalCompilerOptions; -import org.graalvm.compiler.test.SubprocessUtil; -import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl; -import org.graalvm.compiler.truffle.test.TestWithPolyglotOptions; +import jdk.compiler.graal.core.CompilationWrapper; +import jdk.compiler.graal.core.GraalCompilerOptions; +import jdk.compiler.graal.test.SubprocessUtil; +import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl; +import jdk.compiler.graal.truffle.test.TestWithPolyglotOptions; import org.junit.Test; import com.oracle.truffle.api.nodes.RootNode; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AbstractTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AbstractTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java index c8d1552fa1f6..822161d277ae 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AbstractTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.Node; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java index e774340aedec..fa69a9ac63ab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AddTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AssumptionCutsBranchTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AssumptionCutsBranchTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java index 5c5317475004..4860d52e24b8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/AssumptionCutsBranchTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.CompilerAsserts; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/BlockTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/BlockTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java index a6c12db1b587..1be20b527f32 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/BlockTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ConstantTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ConstantTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java index 694d922e8aad..f2a053daa647 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ConstantTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ConstantWithAssumptionTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ConstantWithAssumptionTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java index 69305cf4e056..add49e71c2f8 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ConstantWithAssumptionTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.Assumption; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ExplodeLoopUntilReturnNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ExplodeLoopUntilReturnNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java index 0e523f9e85e5..ecfac260181e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ExplodeLoopUntilReturnNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import java.util.function.IntSupplier; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java index e61cb7d70504..3dbd25498885 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/InliningNullCheckNode1.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/InliningNullCheckNode1.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java index e2a50aabb0ee..6df992f795a2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/InliningNullCheckNode1.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/InliningNullCheckNode2.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/InliningNullCheckNode2.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java index 7b686248b7db..c0c39da41590 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/InliningNullCheckNode2.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/IsLoggableNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/IsLoggableNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java index c2f781c7f186..3b179f8778f1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/IsLoggableNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.TruffleLogger; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LambdaTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LambdaTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java index b21a03dc52bd..7af62132cadf 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LambdaTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import java.util.function.Supplier; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoadLocalTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoadLocalTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java index 30ce62e96c3e..0f090ca19966 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoadLocalTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.FrameSlotTypeException; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoggingNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoggingNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java index 11e744d54fec..a6e48a8eb56b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoggingNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.TruffleLogger; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoopTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoopTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java index 8ac27ee17334..794b5aa63e7d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/LoopTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/NeverPartOfCompilationTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/NeverPartOfCompilationTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java index 7a06559ae5af..b140f5e4a10e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/NeverPartOfCompilationTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/NonConstantTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/NonConstantTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java index ed27c15d2e34..b26df1f1a2f0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/NonConstantTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ObjectEqualsNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ObjectEqualsNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java index da90e6e17dc5..b80679893f4d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ObjectEqualsNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ObjectHashCodeNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ObjectHashCodeNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java index 9632a6bb4dce..54fec4daa2f6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/ObjectHashCodeNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/PartialIntrinsicNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/PartialIntrinsicNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java index 94ce37b323fc..b814aa261362 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/PartialIntrinsicNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/RecursionTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/RecursionTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java index a8025c5e4643..67b5950ac7a4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/RecursionTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java index a3ab16d791db..577e88574f32 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/RootTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; -import org.graalvm.compiler.api.directives.GraalDirectives; +import jdk.compiler.graal.api.directives.GraalDirectives; import com.oracle.truffle.api.frame.FrameDescriptor; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StoreLocalTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StoreLocalTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java index 0944a8f95486..dad151f386b0 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StoreLocalTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.FrameSlotKind; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringEqualsNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringEqualsNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java index 4b4e12cb0327..a9aeb13c2275 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringEqualsNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringHashCodeFinalNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringHashCodeFinalNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java index 5ddd3d95a088..f05c316493fe 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringHashCodeFinalNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringHashCodeNonFinalNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringHashCodeNonFinalNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java index 1d4c48928a03..1be340e01435 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/StringHashCodeNonFinalNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.NodeInfo; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/SynchronizedExceptionMergeNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/SynchronizedExceptionMergeNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java index c7e964e74c7e..ca141505d735 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/SynchronizedExceptionMergeNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/TestNodeFactory.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/TestNodeFactory.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java index acff1e34afac..2d6a4a68a40b 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/TestNodeFactory.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; public class TestNodeFactory { diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/UnrollLoopUntilReturnNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/UnrollLoopUntilReturnNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java index 49f8acd052f5..b2f7ae4408b5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/UnrollLoopUntilReturnNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import java.util.function.IntSupplier; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java index 011b7e84c3bb..d3734729662c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.nodes; +package jdk.compiler.graal.truffle.test.nodes; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/LoopExplosionPhiNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/LoopExplosionPhiNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java index fe59706a1dbf..7af7e28164bb 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/LoopExplosionPhiNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.truffle.test.nodes.explosion; +package jdk.compiler.graal.truffle.test.nodes.explosion; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.CompilerDirectives.CompilationFinal; import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java index d0ec08bec24b..51a4e8a12bf2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.truffle.test.nodes.explosion; +package jdk.compiler.graal.truffle.test.nodes.explosion; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.frame.VirtualFrame; import com.oracle.truffle.api.nodes.ExplodeLoop; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java index 14ad2f96ad08..2e5865813ef7 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.truffle.test.nodes.explosion; +package jdk.compiler.graal.truffle.test.nodes.explosion; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; +import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode; import com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.frame.VirtualFrame; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java index 6842c1b1c733..563dc260761f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/nodes/explosion/UnrollingTestNode.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/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 org.graalvm.compiler.truffle.test.nodes.explosion; +package jdk.compiler.graal.truffle.test.nodes.explosion; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.debug.BlackholeNode; -import org.graalvm.compiler.truffle.test.nodes.AbstractTestNode; +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 com.oracle.truffle.api.CompilerAsserts; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringConstantFoldingTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringConstantFoldingTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java index cd3ba2453c37..878275f32ba2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringConstantFoldingTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.truffle.test.PartialEvaluationTest; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java index 86142898510e..32925be9fbc9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.Arrays; -import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; +import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java index 5b7eae6ce3cf..3d662c2a0df9 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.Arrays; -import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; +import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java index 9db398272707..d4f9ee568b27 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.lang.reflect.Field; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +import jdk.compiler.graal.lir.gen.LIRGeneratorTool; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java index ce611bd92a21..26f2ae7c0eab 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.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 org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; +import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java index 09e8c76dfe4a..7cba2151c2ac 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.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 org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; +import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java index 8a1796c29486..547163d5b21f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; -import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; +import jdk.compiler.graal.replacements.nodes.CalcStringAttributesNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareConstantStrideTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareConstantStrideTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java index 1dfcdf77dd44..b5979d39977f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareConstantStrideTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToNode; +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 org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java index f099ea02922e..70049659488d 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java index dfdc153a4be2..1d37e0ec39bc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCompareTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToNode; +import jdk.compiler.graal.replacements.nodes.ArrayRegionCompareToNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyConstantStrideTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyConstantStrideTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java index 793ae6085e84..96e83d20da84 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyConstantStrideTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode; +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 org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyReturnValueTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyReturnValueTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java index 6d6dd5a8d6f0..3452620afaa2 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyReturnValueTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.lang.reflect.InvocationTargetException; -import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode; +import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java index c7d8237baa14..d8b6c0d803f6 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsCopyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode; +import jdk.compiler.graal.replacements.nodes.ArrayCopyWithConversionsNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java index 52917606acfc..9fff4d9ce91c 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; import java.util.stream.Collectors; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java index ebc870d44e3e..68d4568c4737 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode; +import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java index 167a9460d77e..e18f4c047ec5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfAnyTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode; +import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTableTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTableTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java index 902667903018..43a7d4a840dc 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTableTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode; +import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java index 3b87127adb97..dc50bc03997a 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java index f4dc93c07d4e..280d2f2d5254 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode; +import jdk.compiler.graal.replacements.nodes.ArrayIndexOfNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java index ea9459892c6d..018b5d7ba4e5 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.lir.amd64.AMD64ArrayEqualsOp; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; +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 org.junit.Assert; import org.junit.Assume; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java index 6923570c6b9e..5fac830023b3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import static org.junit.runners.Parameterized.Parameters; import java.util.List; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; +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 org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java index 37a84b43e0b9..82d14585d66e 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.List; import java.util.stream.Collectors; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; +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 org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java index a0d808e19023..f9474e8d82c3 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsRegionEqualsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; +import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java index 5296e8365595..6cdbf0d94389 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringOpsTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.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 org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; +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 org.junit.Assert; import jdk.vm.ci.amd64.AMD64; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java index 5af32584cdf5..4f979c19e4d1 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/TStringTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java @@ -22,23 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; - -import static org.graalvm.compiler.lir.amd64.AMD64ComplexVectorOp.supports; +package jdk.compiler.graal.truffle.test.strings; import java.nio.ByteOrder; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StartNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; -import org.graalvm.compiler.replacements.test.MethodSubstitutionTest; -import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins; +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.compiler.substitutions.TruffleInvocationPlugins; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.amd64.AMD64; @@ -145,12 +144,12 @@ private int getConfigMaxVectorSize() { protected AVXKind.AVXSize getMaxVectorSize() { int maxVectorSize = getConfigMaxVectorSize(); - if (supports(getTarget(), null, AMD64.CPUFeature.AVX512VL)) { + if (AMD64ComplexVectorOp.supports(getTarget(), null, AMD64.CPUFeature.AVX512VL)) { if (maxVectorSize < 0 || maxVectorSize >= 64) { return AVXKind.AVXSize.ZMM; } } - if (supports(getTarget(), null, AMD64.CPUFeature.AVX2)) { + if (AMD64ComplexVectorOp.supports(getTarget(), null, AMD64.CPUFeature.AVX2)) { if (maxVectorSize < 0 || maxVectorSize >= 32) { return AVXKind.AVXSize.YMM; } diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/VectorizedMismatchTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/VectorizedMismatchTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java index 95add1486ebb..f272fbf6bdb4 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/strings/VectorizedMismatchTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.strings; +package jdk.compiler.graal.truffle.test.strings; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.replacements.nodes.VectorizedMismatchNode; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java index e45243cea20f..de6ae566eb19 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.tregex; +package jdk.compiler.graal.truffle.test.tregex; import com.oracle.truffle.api.CallTarget; import com.oracle.truffle.api.CompilerDirectives; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java index ec94e9e5e282..8e31ab66ec3f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/compiler/truffle/test/tregex/TRegexTStringVirtualizationTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.truffle.test.tregex; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.truffle.test.PartialEvaluationTest; -import org.graalvm.compiler.truffle.test.tregex.TRegexTStringVirtualizationTestFactory.MatchBooleanManagedNodeGen; -import org.graalvm.compiler.truffle.test.tregex.TRegexTStringVirtualizationTestFactory.MatchBooleanNativeNodeGen; +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 org.graalvm.polyglot.Context; import org.junit.Assert; import org.junit.Before; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/AddModulesTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/AddModulesTest.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/AddModulesTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/AddModulesTest.java index 849d8f223304..27407aa06b32 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/AddModulesTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/AddModulesTest.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.util.test; +package jdk.compiler.graal.util.test; -import org.graalvm.compiler.test.AddModules; +import jdk.compiler.graal.test.AddModules; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/CollectionSizeTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/CollectionSizeTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java index 05cc0dad0731..0f818cdbd1ba 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/CollectionSizeTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.util.test; +package jdk.compiler.graal.util.test; import static org.junit.Assert.assertEquals; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.test.AddExports; +import jdk.compiler.graal.test.AddExports; import org.junit.Test; @AddExports("java.base/jdk.internal.module") diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/CollectionUtilTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/CollectionUtilTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java index 0e36c0be0b6a..4357b45d31da 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/CollectionUtilTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.util.test; +package jdk.compiler.graal.util.test; import java.util.ArrayList; import java.util.Arrays; @@ -32,7 +32,7 @@ import java.util.NoSuchElementException; import org.graalvm.collections.Pair; -import org.graalvm.util.CollectionsUtil; +import jdk.compiler.graal.util.CollectionsUtil; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/JSONParserTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/JSONParserTest.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/JSONParserTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/JSONParserTest.java index 55b26f60401d..5466081f660f 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/JSONParserTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/JSONParserTest.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.util.test; +package jdk.compiler.graal.util.test; import java.io.IOException; import java.io.StringReader; import java.util.List; import org.graalvm.collections.EconomicMap; -import org.graalvm.util.json.JSONFormatter; -import org.graalvm.util.json.JSONParser; -import org.graalvm.util.json.JSONParserException; +import jdk.compiler.graal.util.json.JSONFormatter; +import jdk.compiler.graal.util.json.JSONParser; +import jdk.compiler.graal.util.json.JSONParserException; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/ObjectSizeEstimate.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/ObjectSizeEstimate.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java index fd77b9090a43..158df3e4cb15 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/ObjectSizeEstimate.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.util.test; +package jdk.compiler.graal.util.test; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/OptionsEncoderTest.java b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/OptionsEncoderTest.java rename to compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java index e8e1e5c7a073..4082311a3091 100644 --- a/compiler/src/jdk.internal.vm.compiler.test/src/org/graalvm/util/test/OptionsEncoderTest.java +++ b/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.util.test; +package jdk.compiler.graal.util.test; -import static org.graalvm.util.OptionsEncoder.decode; -import static org.graalvm.util.OptionsEncoder.encode; +import static jdk.compiler.graal.util.OptionsEncoder.decode; +import static jdk.compiler.graal.util.OptionsEncoder.encode; import static org.junit.Assert.assertEquals; import java.lang.annotation.ElementType; import java.util.Collections; import java.util.Map; -import org.graalvm.util.TypedDataOutputStream; +import jdk.compiler.graal.util.TypedDataOutputStream; import org.junit.Assert; import org.junit.Test; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/directives/GraalDirectives.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/directives/GraalDirectives.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/directives/GraalDirectives.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/directives/GraalDirectives.java index 4f4672608c10..baa05acad675 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/directives/GraalDirectives.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/directives/GraalDirectives.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.directives; +package jdk.compiler.graal.api.directives; import jdk.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/Fold.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Fold.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/Fold.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Fold.java index 0507791348ed..a676f8d2a0f7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/Fold.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Fold.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.replacements; +package jdk.compiler.graal.api.replacements; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/Snippet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Snippet.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/Snippet.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Snippet.java index 95e63d173afc..27dfd88d2f7e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/Snippet.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Snippet.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.replacements; +package jdk.compiler.graal.api.replacements; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java index 55621c632244..0753bd3371ee 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/SnippetReflectionProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.replacements; +package jdk.compiler.graal.api.replacements; import java.lang.reflect.Executable; import java.lang.reflect.Field; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java index 2bc1c7de8717..74dd7e7c605b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/replacements/SnippetTemplateCache.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.replacements; +package jdk.compiler.graal.api.replacements; /** * Marker interface for classes that cache snippet templates. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java index 40ee74c352ab..9589bf83f8ec 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/runtime/GraalJVMCICompiler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.runtime; +package jdk.compiler.graal.api.runtime; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/runtime/GraalRuntime.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalRuntime.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/runtime/GraalRuntime.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalRuntime.java index d8ed3cb25ae3..6049472b4543 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/api/runtime/GraalRuntime.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalRuntime.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.api.runtime; +package jdk.compiler.graal.api.runtime; import jdk.vm.ci.common.JVMCIError; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/AbstractAddress.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AbstractAddress.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/AbstractAddress.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AbstractAddress.java index b15fda7e5aa4..4c2a644e99e7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/AbstractAddress.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AbstractAddress.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; /** * Abstract base class that represents a platform specific address. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/AsmOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AsmOptions.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/AsmOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AsmOptions.java index 22ec4f137e83..dbec4ac40eb1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/AsmOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AsmOptions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; public class AsmOptions { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Assembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Assembler.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Assembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Assembler.java index 1f7b4ae52ce8..44f01146560f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Assembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Assembler.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; import java.util.ArrayDeque; import java.util.EnumSet; import java.util.function.Consumer; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/BranchTargetOutOfBoundsException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/BranchTargetOutOfBoundsException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java index 317737217981..631b54ead948 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/BranchTargetOutOfBoundsException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; -import org.graalvm.compiler.core.common.GraalBailoutException; +import jdk.compiler.graal.core.common.GraalBailoutException; @SuppressWarnings("serial") public class BranchTargetOutOfBoundsException extends GraalBailoutException { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Buffer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Buffer.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Buffer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Buffer.java index e64c2c3456da..c77125f1f028 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Buffer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Buffer.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; import java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; -import org.graalvm.compiler.core.common.NumUtil; +import jdk.compiler.graal.core.common.NumUtil; /** * Code buffer management for the assembler. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Label.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Label.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Label.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Label.java index ad2f02949fa3..4d1bdbe722ea 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/Label.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Label.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; import java.util.ArrayList; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; /** * This class represents a label within assembly code. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/VectorSize.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/VectorSize.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/VectorSize.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/VectorSize.java index cd709ee4c53a..f320d080704d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/VectorSize.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/VectorSize.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm; +package jdk.compiler.graal.asm; /** * Size of vector in SIMD instructions. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java index 2c351623eb90..75372cb9374f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Assembler.LoadFlag; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.rd; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.rn; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.rs1; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.rs2; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.rs3; +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 java.util.Arrays; import java.util.HashMap; import java.util.Map; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.NumUtil; +import jdk.compiler.graal.core.common.Stride; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDMacroAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDMacroAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java index 84e3abe7af3e..e2f94ee384de 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64ASIMDMacroAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64; +package jdk.compiler.graal.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.NumUtil; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java index 95c94be25a7b..df789faf2bf1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64Address.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java @@ -22,17 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64; +package jdk.compiler.graal.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.aarch64.AArch64.zr; -import org.graalvm.compiler.asm.AbstractAddress; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.asm.AbstractAddress; +import jdk.compiler.graal.core.common.NumUtil; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; @@ -116,8 +113,8 @@ public enum AddressingMode { * * Constant value is determined by the specific instruction and the number of registers * used. See - * {@link #determineStructureImmediateValue(ASIMDInstruction, ASIMDSize, ElementSize)} for - * more details. + * {@link #determineStructureImmediateValue(AArch64ASIMDAssembler.ASIMDInstruction, AArch64ASIMDAssembler.ASIMDSize, AArch64ASIMDAssembler.ElementSize)} + * for more details. */ IMMEDIATE_STRUCTURE_POST_INDEXED, } @@ -343,7 +340,7 @@ public static AArch64Address createStructureRegisterPostIndexAddress(Register ba * For structure memory accesses the size of the immediate value is dictated by its * {instruction, size, eSize} parameters. */ - static int determineStructureImmediateValue(ASIMDInstruction instruction, ASIMDSize size, ElementSize eSize) { + static int determineStructureImmediateValue(AArch64ASIMDAssembler.ASIMDInstruction instruction, AArch64ASIMDAssembler.ASIMDSize size, AArch64ASIMDAssembler.ElementSize eSize) { int regByteSize = size.bytes(); int eByteSize = eSize.bytes(); switch (instruction) { @@ -374,10 +371,11 @@ static int determineStructureImmediateValue(ASIMDInstruction instruction, ASIMDS * AArch64Address specifying a structure memory access of the form "[Xn|SP], imm", where imm is * a post-indexed value to add. Note that the value of imm is dictated by the specific * {instruction, size, eSize} combination. See - * {@link #determineStructureImmediateValue(ASIMDInstruction, ASIMDSize, ElementSize)} for what - * the expected value is. + * {@link #determineStructureImmediateValue(AArch64ASIMDAssembler.ASIMDInstruction, AArch64ASIMDAssembler.ASIMDSize, AArch64ASIMDAssembler.ElementSize)} + * for what the expected value is. */ - public static AArch64Address createStructureImmediatePostIndexAddress(ASIMDInstruction instruction, ASIMDSize size, ElementSize eSize, Register base, int immediate) { + public static AArch64Address createStructureImmediatePostIndexAddress(AArch64ASIMDAssembler.ASIMDInstruction instruction, AArch64ASIMDAssembler.ASIMDSize size, + AArch64ASIMDAssembler.ElementSize eSize, Register base, int immediate) { int expectedImmediate = determineStructureImmediateValue(instruction, size, eSize); GraalError.guarantee(expectedImmediate == immediate, "provided immediate cannot be encoded in instruction."); return new AArch64Address(ANY_SIZE, base, zr, immediate, false, null, AddressingMode.IMMEDIATE_STRUCTURE_POST_INDEXED); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java index 90316bd64760..d4aee523d0c0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64Assembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java @@ -23,7 +23,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64; +package jdk.compiler.graal.asm.aarch64; import static jdk.vm.ci.aarch64.AArch64.CPU; import static jdk.vm.ci.aarch64.AArch64.SIMD; @@ -31,150 +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 org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersFF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRRR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRRRZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersRZP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifyRegistersZRP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFFF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFFFF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersFZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPPZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersPZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRRR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRZR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersRZZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeAndRegistersZZZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizeRegistersZPZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizesAndRegistersFZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Asserts.verifySizesAndRegistersRF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ADC; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ADCS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ADD; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ADDS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ADR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ADRP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.AND; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ANDS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ASRV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BFM; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BIC; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BICS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BLR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.BRK; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CAS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CCMP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CLREX; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CLS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CLZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CSEL; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CSINC; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.CSNEG; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.DC; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.DMB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.DSB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.EON; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.EOR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.EXTR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FABS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FADD; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCCMP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCMP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCMPZERO; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCSEL; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVT2D; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVT2H; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVT2S; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVTAS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVTMS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FCVTZS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FDIV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMADD; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMAX; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMIN; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMOV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMSUB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FMUL; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FNEG; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTM; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTN; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FRINTZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FSQRT; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.FSUB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.HINT; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.HLT; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ISB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDADD; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDAR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDAXR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDRS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDXR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LSLV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LSRV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MADD; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVK; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVN; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MOVZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MRS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.MSUB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ORN; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.ORR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.RBIT; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.RET; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.REVW; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.REVX; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.RORV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SBC; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SBCS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SBFM; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SCVTF; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SDIV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.STLR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.STLXR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.STP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.STR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.STXR; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SUB; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SUBS; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.SWP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.TBNZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.TBZ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.UBFM; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.UDIV; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.InstructionType.FP32; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.InstructionType.FP64; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.InstructionType.General32; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.InstructionType.General64; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.InstructionType.floatFromSize; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.InstructionType.generalFromSize; +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 java.nio.ByteBuffer; import java.nio.ByteOrder; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.asm.Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.asm.Assembler; +import jdk.compiler.graal.core.common.NumUtil; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64.CPUFeature; @@ -1647,7 +1646,7 @@ protected final void ldrHelper(int srcSize, Register rt, AArch64Address address, assert allowZeroReg ? verifyRegistersZ(rt) : verifyRegistersR(rt); /* When using an immediate or register based addressing mode, then the load flag is set. */ - int loadFlag = address.getAddressingMode() == AddressingMode.PC_LITERAL ? 0 : LoadFlag; + int loadFlag = address.getAddressingMode() == AArch64Address.AddressingMode.PC_LITERAL ? 0 : LoadFlag; loadStoreInstruction(LDR, rt, address, false, getLog2TransferSize(srcSize), loadFlag); } @@ -1828,7 +1827,7 @@ private void loadStoreInstruction(Instruction instr, Register reg, AArch64Addres assert address.getBitMemoryTransferSize() == AArch64Address.ANY_SIZE || getLog2TransferSize(address.getBitMemoryTransferSize()) == log2TransferSize; int transferSizeEncoding; - if (address.getAddressingMode() == AddressingMode.PC_LITERAL) { + if (address.getAddressingMode() == AArch64Address.AddressingMode.PC_LITERAL) { assert log2TransferSize >= 2 : "PC literal loads only works for load/stores of 32-bit and larger"; transferSizeEncoding = (log2TransferSize - 2) << LoadStoreTransferSizeOffset; } else { @@ -1850,7 +1849,7 @@ private void loadStoreInstruction(Instruction instr, Register reg, AArch64Addres break; case EXTENDED_REGISTER_OFFSET: case REGISTER_OFFSET: - ExtendType extendType = address.getAddressingMode() == AddressingMode.EXTENDED_REGISTER_OFFSET ? address.getExtendType() : ExtendType.UXTX; + ExtendType extendType = address.getAddressingMode() == AArch64Address.AddressingMode.EXTENDED_REGISTER_OFFSET ? address.getExtendType() : ExtendType.UXTX; int shouldScaleFlag = (address.isRegisterOffsetScaled() ? 1 : 0) << LoadStoreScaledRegOffset; emitInt(memOp | LoadStoreRegisterOp | rs2(address.getOffset()) | extendType.encoding << ExtendTypeOffset | shouldScaleFlag | rs1(address.getBase())); break; @@ -3266,7 +3265,7 @@ public void fldr(int size, Register rt, AArch64Address address) { assert verifyRegistersF(rt); /* When using an immediate or register based addressing mode, then the load flag is set. */ - int loadFlag = address.getAddressingMode() == AddressingMode.PC_LITERAL ? 0 : LoadFlag; + int loadFlag = address.getAddressingMode() == AArch64Address.AddressingMode.PC_LITERAL ? 0 : LoadFlag; loadStoreInstruction(LDR, rt, address, true, getLog2TransferSize(size), loadFlag); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java index 816a5ad9edaa..e11b63d54d72 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/AArch64MacroAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.asm.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.LDP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.Instruction.STP; - -import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.MovSequenceAnnotation.MovAction; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; +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 jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; @@ -243,16 +243,13 @@ public AArch64Address makeAddress(int bitMemoryTransferSize, Register base, int * * @param dst general purpose register. May not be null, zero-register or stackpointer. * @param address address whose value is loaded into dst. May not be null, - * {@link org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode#IMMEDIATE_POST_INDEXED - * POST_INDEXED}, - * {@link org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode#IMMEDIATE_PRE_INDEXED - * PRE_INDEXED}, - * {@link org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode#IMMEDIATE_PAIR_SIGNED_SCALED + * {@link AArch64Address.AddressingMode#IMMEDIATE_POST_INDEXED POST_INDEXED}, + * {@link AArch64Address.AddressingMode#IMMEDIATE_PRE_INDEXED PRE_INDEXED}, + * {@link AArch64Address.AddressingMode#IMMEDIATE_PAIR_SIGNED_SCALED * PAIR_SIGNED_SCALED}, - * {@link org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode#IMMEDIATE_PAIR_POST_INDEXED + * {@link AArch64Address.AddressingMode#IMMEDIATE_PAIR_POST_INDEXED * PAIR_POST_INDEXED}, or - * {@link org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode#IMMEDIATE_PAIR_PRE_INDEXED - * PAIR PRE_INDEXED}. + * {@link AArch64Address.AddressingMode#IMMEDIATE_PAIR_PRE_INDEXED PAIR PRE_INDEXED}. */ public void loadAddress(Register dst, AArch64Address address) { assert dst.getRegisterCategory().equals(CPU); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/ASIMDKind.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/ASIMDKind.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java index 359fbf85c3ed..2a2d98dae85e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/aarch64/ASIMDKind.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.aarch64; +package jdk.compiler.graal.asm.aarch64; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64Address.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Address.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64Address.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Address.java index b2e608b0ba7a..bed682dda76c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64Address.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Address.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64; +package jdk.compiler.graal.asm.amd64; -import org.graalvm.compiler.asm.AbstractAddress; -import org.graalvm.compiler.core.common.Stride; +import jdk.compiler.graal.asm.AbstractAddress; +import jdk.compiler.graal.core.common.Stride; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java similarity index 69% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java index 06f8bdb19ee5..9b455ab08954 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64Assembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64; +package jdk.compiler.graal.asm.amd64; import static jdk.vm.ci.amd64.AMD64.CPU; import static jdk.vm.ci.amd64.AMD64.MASK; @@ -39,80 +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 org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADC; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SBB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.DEC; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.INC; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.MUL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NEG; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NOT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp.SHA1RNDS4; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.ADCX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.ADOX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.IMUL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1MSG1; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1MSG2; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA1NEXTE; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256MSG1; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256MSG2; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.SHA256RNDS2; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.RCL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.RCR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRVMOp.MULX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VCVTPS2PH; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp.RORXL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp.RORXQ; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VCVTPH2PS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VGF2P8AFFINEQB; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B0; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z0; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z1; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L128; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L256; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L512; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LZ; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F38; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F3A; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_66; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F2; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F3; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W0; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W1; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.WIG; -import static org.graalvm.compiler.core.common.NumUtil.isByte; -import static org.graalvm.compiler.core.common.NumUtil.isInt; -import static org.graalvm.compiler.core.common.NumUtil.isShiftCount; -import static org.graalvm.compiler.core.common.NumUtil.isUByte; +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 java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; @@ -253,23 +227,23 @@ public String toString() { */ private enum OpAssertion { NoOperandAssertion(null, null), - ByteAssertion(CPU, CPU, BYTE), - ByteOrLargerAssertion(CPU, CPU, BYTE, WORD, DWORD, QWORD), - WordOrLargerAssertion(CPU, CPU, WORD, DWORD, QWORD), - DwordOrLargerAssertion(CPU, CPU, DWORD, QWORD), - WordOrQwordAssertion(CPU, CPU, WORD, QWORD), - QwordAssertion(CPU, CPU, QWORD), - FloatAssertion(XMM, XMM, SS, SD, PS, PD), - ScalarFloatAssertion(XMM, XMM, SS, SD), - PackedFloatAssertion(XMM, XMM, PS, PD), - SingleAssertion(XMM, XMM, SS), - DoubleAssertion(XMM, XMM, SD), - PackedSingleAssertion(XMM, XMM, PS), - PackedDoubleAssertion(XMM, XMM, PD), - IntToFloatAssertion(XMM, CPU, DWORD, QWORD), - DwordToFloatAssertion(XMM, CPU, DWORD), - QwordToFloatAssertion(XMM, CPU, QWORD), - FloatToIntAssertion(CPU, XMM, DWORD, QWORD); + ByteAssertion(CPU, CPU, OperandSize.BYTE), + ByteOrLargerAssertion(CPU, CPU, OperandSize.BYTE, OperandSize.WORD, OperandSize.DWORD, OperandSize.QWORD), + WordOrLargerAssertion(CPU, CPU, OperandSize.WORD, OperandSize.DWORD, OperandSize.QWORD), + DwordOrLargerAssertion(CPU, CPU, OperandSize.DWORD, OperandSize.QWORD), + WordOrQwordAssertion(CPU, CPU, OperandSize.WORD, OperandSize.QWORD), + QwordAssertion(CPU, CPU, OperandSize.QWORD), + FloatAssertion(XMM, XMM, OperandSize.SS, OperandSize.SD, OperandSize.PS, OperandSize.PD), + ScalarFloatAssertion(XMM, XMM, OperandSize.SS, OperandSize.SD), + PackedFloatAssertion(XMM, XMM, OperandSize.PS, OperandSize.PD), + SingleAssertion(XMM, XMM, OperandSize.SS), + DoubleAssertion(XMM, XMM, OperandSize.SD), + PackedSingleAssertion(XMM, XMM, OperandSize.PS), + PackedDoubleAssertion(XMM, XMM, OperandSize.PD), + IntToFloatAssertion(XMM, CPU, OperandSize.DWORD, OperandSize.QWORD), + DwordToFloatAssertion(XMM, CPU, OperandSize.DWORD), + QwordToFloatAssertion(XMM, CPU, OperandSize.QWORD), + FloatToIntAssertion(CPU, XMM, OperandSize.DWORD, OperandSize.QWORD); private final RegisterCategory resultCategory; private final RegisterCategory inputCategory; @@ -343,7 +317,7 @@ protected final void emitOpcode(AMD64Assembler asm, OperandSize size, int rxb, i asm.emitByte(size.getSizePrefix()); } int rexPrefix = 0x40 | rxb; - if (size == QWORD) { + if (size == OperandSize.QWORD) { rexPrefix |= 0x08; } if (rexPrefix != 0x40 || (dstIsByte && dstEnc >= 4) || (srcIsByte && srcEnc >= 4)) { @@ -680,8 +654,8 @@ 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 {@code org.graalvm.compiler.lir.amd64.vector.AMD64VectorUnary.AVXConvertOp}, - * we manually insert an {@code XOR} instruction for {@code dst}. + * {@code dst}. In {@link jdk.compiler.graal.lir.amd64.vector.AMD64VectorUnary.AVXConvertOp}, we + * manually insert an {@code XOR} instruction for {@code dst}. */ private enum PreferredNDS { NONE, @@ -780,7 +754,7 @@ protected AMD64Z0Op(String opcode, int prefix1, int prefix2, int op, CPUFeature } public void emit(AMD64Assembler asm) { - this.emitOpcode(asm, BYTE, getRXB(null, (Register) null), 0, 0); + this.emitOpcode(asm, OperandSize.BYTE, getRXB(null, (Register) null), 0, 0); } } @@ -855,7 +829,7 @@ public final void emit(AMD64Assembler asm, OperandSize size, Register dst, Regis assert verify(asm, size, dst, src); assert isSSEInstruction(); Register nds = preferredNDS.getNds(dst, src); - asm.simdPrefix(dst, nds, src, size, prefix1, prefix2, size == QWORD); + asm.simdPrefix(dst, nds, src, size, prefix1, prefix2, size == OperandSize.QWORD); asm.emitByte(op); asm.emitModRM(dst, src); } @@ -866,7 +840,7 @@ public final void emit(AMD64Assembler asm, OperandSize size, Register dst, AMD64 assert isSSEInstruction(); // MOVSS/SD are not RVM instruction when the dst is an address Register nds = (this == MOVSS || this == MOVSD) ? Register.None : preferredNDS.getNds(dst, src); - asm.simdPrefix(dst, nds, src, size, prefix1, prefix2, size == QWORD); + asm.simdPrefix(dst, nds, src, size, prefix1, prefix2, size == OperandSize.QWORD); asm.emitByte(op); asm.emitOperandHelper(dst, src, 0); } @@ -901,7 +875,7 @@ protected SSEMROp(String opcode, int prefix1, int prefix2, int op, PreferredNDS public final void emit(AMD64Assembler asm, OperandSize size, Register dst, Register src) { assert verify(asm, size, src, dst); assert isSSEInstruction(); - asm.simdPrefix(src, preferredNDS.getNds(dst, src), dst, size, prefix1, prefix2, size == QWORD); + asm.simdPrefix(src, preferredNDS.getNds(dst, src), dst, size, prefix1, prefix2, size == OperandSize.QWORD); asm.emitByte(op); asm.emitModRM(src, dst); } @@ -912,7 +886,7 @@ public final void emit(AMD64Assembler asm, OperandSize size, AMD64Address dst, R assert isSSEInstruction(); // MOVSS/SD are not RVM instruction when the dst is an address Register nds = (this == MOVSS || this == MOVSD) ? Register.None : preferredNDS.getNds(src, dst); - asm.simdPrefix(src, nds, dst, size, prefix1, prefix2, size == QWORD); + asm.simdPrefix(src, nds, dst, size, prefix1, prefix2, size == OperandSize.QWORD); asm.emitByte(op); asm.emitOperandHelper(src, dst, 0); } @@ -956,7 +930,7 @@ private AMD64BinaryArithmetic(String opcode, int code) { } public AMD64MIOp getMIOpcode(OperandSize size, boolean sx) { - if (size == BYTE) { + if (size == OperandSize.BYTE) { return byteImmOp; } else if (sx) { return immSxOp; @@ -966,7 +940,7 @@ public AMD64MIOp getMIOpcode(OperandSize size, boolean sx) { } public AMD64MROp getMROpcode(OperandSize size) { - if (size == BYTE) { + if (size == OperandSize.BYTE) { return byteMrOp; } else { return mrOp; @@ -974,7 +948,7 @@ public AMD64MROp getMROpcode(OperandSize size) { } public AMD64RMOp getRMOpcode(OperandSize size) { - if (size == BYTE) { + if (size == OperandSize.BYTE) { return byteRmOp; } else { return rmOp; @@ -1038,20 +1012,20 @@ private enum EVEXFeatureAssertion { public boolean check(EnumSet features, int l) { switch (l) { - case L128: + case VEXPrefixConfig.L128: GraalError.guarantee(l128features != null && features.containsAll(l128features), "emitting illegal 128 bit instruction, required features: %s", l128features); break; - case L256: + case VEXPrefixConfig.L256: GraalError.guarantee(l256features != null && features.containsAll(l256features), "emitting illegal 256 bit instruction, required features: %s", l256features); break; - case L512: + case VEXPrefixConfig.L512: GraalError.guarantee(l512features != null && features.containsAll(l512features), "emitting illegal 512 bit instruction, required features: %s", l512features); break; } return true; } - public boolean supports(EnumSet features, AVXSize avxSize) { + public boolean supports(EnumSet features, AVXKind.AVXSize avxSize) { switch (avxSize) { case XMM: return l128features != null && features.containsAll(l128features); @@ -1173,20 +1147,20 @@ private enum VEXOpAssertion { this.imm8Category = imm8Category; } - public boolean check(EnumSet features, AVXSize size, Register r, Register v, Register m) { + public boolean check(EnumSet features, AVXKind.AVXSize size, Register r, Register v, Register m) { return check(features, getLFlag(size), r, v, m, null); } - public boolean check(EnumSet features, AVXSize size, Register r, Register v, Register m, Register imm8) { + public boolean check(EnumSet features, AVXKind.AVXSize size, Register r, Register v, Register m, Register imm8) { return check(features, getLFlag(size), r, v, m, imm8); } public boolean check(EnumSet features, int l, Register r, Register v, Register m, Register imm8) { - if (isAVX512Register(r) || isAVX512Register(v) || isAVX512Register(m) || l == L512) { + if (isAVX512Register(r) || isAVX512Register(v) || isAVX512Register(m) || l == VEXPrefixConfig.L512) { GraalError.guarantee(l512features != null && l512features.check(features, l), "emitting illegal 512 bit instruction, required features: %s", l512features); - } else if (l == L128) { + } else if (l == VEXPrefixConfig.L128) { GraalError.guarantee(l128feature != null && features.contains(l128feature), "emitting illegal 128 bit instruction, required feature: %s", l128feature); - } else if (l == L256) { + } else if (l == VEXPrefixConfig.L256) { GraalError.guarantee(l256feature != null && features.contains(l256feature), "emitting illegal 256 bit instruction, required feature: %s", l256feature); } if (r != null) { @@ -1207,13 +1181,13 @@ public boolean check(EnumSet features, int l, Register r, Register v return true; } - public boolean supports(EnumSet features, AVXSize avxSize, boolean useZMMRegisters) { + public boolean supports(EnumSet features, AVXKind.AVXSize avxSize, boolean useZMMRegisters) { boolean extendedFeatureCheck = extendedFeature != null ? features.contains(extendedFeature) : true; - if (useZMMRegisters || avxSize == AVXSize.ZMM) { + if (useZMMRegisters || avxSize == AVXKind.AVXSize.ZMM) { return l512features != null && l512features.supports(features, avxSize) && extendedFeatureCheck; - } else if (avxSize == AVXSize.XMM) { + } else if (avxSize == AVXKind.AVXSize.XMM) { return l128feature != null && features.contains(l128feature) && extendedFeatureCheck; - } else if (avxSize == AVXSize.YMM) { + } else if (avxSize == AVXKind.AVXSize.YMM) { return l256feature != null && features.contains(l256feature) && extendedFeatureCheck; } throw GraalError.shouldNotReachHereUnexpectedValue(avxSize); // ExcludeFromJacocoGeneratedReport @@ -1247,14 +1221,14 @@ protected VexOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion } protected VexOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { - this(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, WIG); + this(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, VEXPrefixConfig.WIG); } - public final boolean isSupported(AMD64Assembler vasm, AVXSize size) { + public final boolean isSupported(AMD64Assembler vasm, AVXKind.AVXSize size) { return isSupported(vasm, size, false); } - public final boolean isSupported(AMD64Assembler vasm, AVXSize size, boolean useZMMRegisters) { + public final boolean isSupported(AMD64Assembler vasm, AVXKind.AVXSize size, boolean useZMMRegisters) { return assertion.supports(vasm.getFeatures(), size, useZMMRegisters); } @@ -1267,7 +1241,7 @@ public String toString() { return opcode; } - protected final int getDisp8Scale(boolean useEvex, AVXSize size) { + protected final int getDisp8Scale(boolean useEvex, AVXKind.AVXSize size) { return useEvex ? evexTuple.getDisp8ScalingFactor(size) : DEFAULT_DISP8_SCALE; } @@ -1278,14 +1252,14 @@ protected final int getDisp8Scale(boolean useEvex, AVXSize size) { */ public static class VexRROp extends VexOp { // @formatter:off - public static final VexRROp VMASKMOVDQU = new VexRROp("VMASKMOVDQU", P_66, M_0F, WIG, 0xF7, VEXOpAssertion.AVX1_128ONLY, EVEXTuple.INVALID, WIG); + public static final VexRROp VMASKMOVDQU = new VexRROp("VMASKMOVDQU", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xF7, VEXOpAssertion.AVX1_128ONLY, EVEXTuple.INVALID, VEXPrefixConfig.WIG); // @formatter:on protected VexRROp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { super(opcode, pp, mmmmm, w, op, assertion, evexTuple, wEvex); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); assert op != 0x1A || op != 0x5A; asm.vexPrefix(dst, Register.None, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); @@ -1293,7 +1267,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { asm.emitModRM(dst, src); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); assert op != 0x1A || op != 0x5A; asm.vexPrefix(dst, Register.None, src, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); @@ -1307,84 +1281,84 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, R */ public static class VexRMOp extends VexRROp { // @formatter:off - public static final VexRMOp VAESIMC = new VexRMOp("VAESIMC", P_66, M_0F38, WIG, 0xDB, VEXOpAssertion.AVX1_128ONLY_AES); - public static final VexRMOp VCVTTSS2SI = new VexRMOp("VCVTTSS2SI", P_F3, M_0F, W0, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_32BIT, W0); - public static final VexRMOp VCVTTSS2SQ = new VexRMOp("VCVTTSS2SQ", P_F3, M_0F, W1, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_32BIT, W1); - public static final VexRMOp VCVTTSD2SI = new VexRMOp("VCVTTSD2SI", P_F2, M_0F, W0, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_64BIT, W0); - public static final VexRMOp VCVTTSD2SQ = new VexRMOp("VCVTTSD2SQ", P_F2, M_0F, W1, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_64BIT, W1); - public static final VexRMOp VCVTPS2PD = new VexRMOp("VCVTPS2PD", P_, M_0F, WIG, 0x5A, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.HVM, W0); - public static final VexRMOp VCVTPD2PS = new VexRMOp("VCVTPD2PS", P_66, M_0F, WIG, 0x5A, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VCVTDQ2PS = new VexRMOp("VCVTDQ2PS", P_, M_0F, WIG, 0x5B, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VCVTQQ2PS = new VexRMOp("VCVTQQ2PS", P_, M_0F, W1, 0x5B, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VCVTQQ2PD = new VexRMOp("VCVTQQ2PD", P_F3, M_0F, W1, 0xE6, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VCVTTPS2DQ = new VexRMOp("VCVTTPS2DQ", P_F3, M_0F, WIG, 0x5B, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VCVTTPS2QQ = new VexRMOp("VCVTTPS2QQ", P_66, M_0F, W0, 0x7A, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.HVM, W0); - public static final VexRMOp VCVTTPD2DQ = new VexRMOp("VCVTTPD2DQ", P_66, M_0F, WIG, 0xE6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VCVTTPD2QQ = new VexRMOp("VCVTTPD2QQ", P_66, M_0F, W1, 0x7A, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VCVTDQ2PD = new VexRMOp("VCVTDQ2PD", P_F3, M_0F, WIG, 0xE6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.HVM, W0); - public static final VexRMOp VBROADCASTSS = new VexRMOp("VBROADCASTSS", P_66, M_0F38, W0, 0x18, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VBROADCASTSD = new VexRMOp("VBROADCASTSD", P_66, M_0F38, W0, 0x19, VEXOpAssertion.AVX1_256ONLY_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VBROADCASTF128 = new VexRMOp("VBROADCASTF128", P_66, M_0F38, W0, 0x1A, VEXOpAssertion.AVX1_256ONLY); - public static final VexRMOp VPBROADCASTI128 = new VexRMOp("VPBROADCASTI128", P_66, M_0F38, W0, 0x5A, VEXOpAssertion.AVX2_256ONLY); - public static final VexRMOp VPBROADCASTB = new VexRMOp("VPBROADCASTB", P_66, M_0F38, W0, 0x78, VEXOpAssertion.AVX2_AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VPBROADCASTW = new VexRMOp("VPBROADCASTW", P_66, M_0F38, W0, 0x79, VEXOpAssertion.AVX2_AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VPBROADCASTD = new VexRMOp("VPBROADCASTD", P_66, M_0F38, W0, 0x58, VEXOpAssertion.AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VPBROADCASTQ = new VexRMOp("VPBROADCASTQ", P_66, M_0F38, W0, 0x59, VEXOpAssertion.AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VPMOVMSKB = new VexRMOp("VPMOVMSKB", P_66, M_0F, WIG, 0xD7, VEXOpAssertion.AVX1_2_CPU_XMM); - public static final VexRMOp VPMOVB2M = new VexRMOp("VPMOVB2M", P_F3, M_0F38, W0, 0x29, VEXOpAssertion.MASK_NULL_XMM_AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VPMOVW2M = new VexRMOp("VPMOVW2M", P_F3, M_0F38, W1, 0x29, VEXOpAssertion.MASK_NULL_XMM_AVX512BW_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VPMOVD2M = new VexRMOp("VPMOVD2M", P_F3, M_0F38, W0, 0x39, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VPMOVQ2M = new VexRMOp("VPMOVQ2M", P_F3, M_0F38, W1, 0x39, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VPMOVSXBW = new VexRMOp("VPMOVSXBW", P_66, M_0F38, WIG, 0x20, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.HVM, WIG); - public static final VexRMOp VPMOVSXBD = new VexRMOp("VPMOVSXBD", P_66, M_0F38, WIG, 0x21, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, WIG); - public static final VexRMOp VPMOVSXBQ = new VexRMOp("VPMOVSXBQ", P_66, M_0F38, WIG, 0x22, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.OVM, WIG); - public static final VexRMOp VPMOVSXWD = new VexRMOp("VPMOVSXWD", P_66, M_0F38, WIG, 0x23, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, WIG); - public static final VexRMOp VPMOVSXWQ = new VexRMOp("VPMOVSXWQ", P_66, M_0F38, WIG, 0x24, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, WIG); - public static final VexRMOp VPMOVSXDQ = new VexRMOp("VPMOVSXDQ", P_66, M_0F38, WIG, 0x25, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, WIG); - public static final VexRMOp VPMOVZXBW = new VexRMOp("VPMOVZXBW", P_66, M_0F38, WIG, 0x30, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.HVM, WIG); - public static final VexRMOp VPMOVZXBD = new VexRMOp("VPMOVZXBD", P_66, M_0F38, WIG, 0x31, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, WIG); - public static final VexRMOp VPMOVZXBQ = new VexRMOp("VPMOVZXBQ", P_66, M_0F38, WIG, 0x32, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.OVM, WIG); - public static final VexRMOp VPMOVZXWD = new VexRMOp("VPMOVZXWD", P_66, M_0F38, WIG, 0x33, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, WIG); - public static final VexRMOp VPMOVZXWQ = new VexRMOp("VPMOVZXWQ", P_66, M_0F38, WIG, 0x34, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, WIG); - public static final VexRMOp VPMOVZXDQ = new VexRMOp("VPMOVZXDQ", P_66, M_0F38, WIG, 0x35, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, WIG); - public static final VexRMOp VPTEST = new VexRMOp("VPTEST", P_66, M_0F38, WIG, 0x17); - public static final VexRMOp VSQRTPD = new VexRMOp("VSQRTPD", P_66, M_0F, WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRMOp VSQRTPS = new VexRMOp("VSQRTPS", P_, M_0F, WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VUCOMISS = new VexRMOp("VUCOMISS", P_, M_0F, WIG, 0x2E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRMOp VUCOMISD = new VexRMOp("VUCOMISD", P_66, M_0F, WIG, 0x2E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRMOp VPABSB = new VexRMOp("VPABSB", P_66, M_0F38, WIG, 0x1C, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRMOp VPABSW = new VexRMOp("VPABSW", P_66, M_0F38, WIG, 0x1D, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRMOp VPABSD = new VexRMOp("VPABSD", P_66, M_0F38, WIG, 0x1E, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMOp VPABSQ = new VexRMOp("VPABSQ", P_66, M_0F38, WIG, 0x1F, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - - public static final VexRMOp VCVTPH2PS = new VexRMOp("VCVTPH2PS", P_66, M_0F38, W0, 0x13, VEXOpAssertion.F16C_AVX512F_VL, EVEXTuple.HVM, W0); + public static final VexRMOp VAESIMC = new VexRMOp("VAESIMC", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xDB, VEXOpAssertion.AVX1_128ONLY_AES); + public static final VexRMOp VCVTTSS2SI = new VexRMOp("VCVTTSS2SI", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_32BIT, VEXPrefixConfig.W0); + public static final VexRMOp VCVTTSS2SQ = new VexRMOp("VCVTTSS2SQ", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_32BIT, VEXPrefixConfig.W1); + public static final VexRMOp VCVTTSD2SI = new VexRMOp("VCVTTSD2SI", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_64BIT, VEXPrefixConfig.W0); + public static final VexRMOp VCVTTSD2SQ = new VexRMOp("VCVTTSD2SQ", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x2C, VEXOpAssertion.CPU_XMM_AVX512F_128ONLY, EVEXTuple.T1F_64BIT, VEXPrefixConfig.W1); + public static final VexRMOp VCVTPS2PD = new VexRMOp("VCVTPS2PD", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5A, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.W0); + public static final VexRMOp VCVTPD2PS = new VexRMOp("VCVTPD2PS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5A, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VCVTDQ2PS = new VexRMOp("VCVTDQ2PS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5B, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VCVTQQ2PS = new VexRMOp("VCVTQQ2PS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x5B, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VCVTQQ2PD = new VexRMOp("VCVTQQ2PD", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0xE6, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VCVTTPS2DQ = new VexRMOp("VCVTTPS2DQ", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5B, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VCVTTPS2QQ = new VexRMOp("VCVTTPS2QQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0x7A, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.HVM, VEXPrefixConfig.W0); + public static final VexRMOp VCVTTPD2DQ = new VexRMOp("VCVTTPD2DQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xE6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VCVTTPD2QQ = new VexRMOp("VCVTTPD2QQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x7A, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VCVTDQ2PD = new VexRMOp("VCVTDQ2PD", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xE6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.W0); + public static final VexRMOp VBROADCASTSS = new VexRMOp("VBROADCASTSS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x18, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VBROADCASTSD = new VexRMOp("VBROADCASTSD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x19, VEXOpAssertion.AVX1_256ONLY_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VBROADCASTF128 = new VexRMOp("VBROADCASTF128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x1A, VEXOpAssertion.AVX1_256ONLY); + public static final VexRMOp VPBROADCASTI128 = new VexRMOp("VPBROADCASTI128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x5A, VEXOpAssertion.AVX2_256ONLY); + public static final VexRMOp VPBROADCASTB = new VexRMOp("VPBROADCASTB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x78, VEXOpAssertion.AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VPBROADCASTW = new VexRMOp("VPBROADCASTW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x79, VEXOpAssertion.AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VPBROADCASTD = new VexRMOp("VPBROADCASTD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x58, VEXOpAssertion.AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VPBROADCASTQ = new VexRMOp("VPBROADCASTQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x59, VEXOpAssertion.AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VPMOVMSKB = new VexRMOp("VPMOVMSKB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD7, VEXOpAssertion.AVX1_2_CPU_XMM); + public static final VexRMOp VPMOVB2M = new VexRMOp("VPMOVB2M", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x29, VEXOpAssertion.MASK_NULL_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VPMOVW2M = new VexRMOp("VPMOVW2M", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x29, VEXOpAssertion.MASK_NULL_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VPMOVD2M = new VexRMOp("VPMOVD2M", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x39, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VPMOVQ2M = new VexRMOp("VPMOVQ2M", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x39, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VPMOVSXBW = new VexRMOp("VPMOVSXBW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x20, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.HVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVSXBD = new VexRMOp("VPMOVSXBD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x21, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVSXBQ = new VexRMOp("VPMOVSXBQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x22, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.OVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVSXWD = new VexRMOp("VPMOVSXWD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x23, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVSXWQ = new VexRMOp("VPMOVSXWQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x24, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVSXDQ = new VexRMOp("VPMOVSXDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x25, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVZXBW = new VexRMOp("VPMOVZXBW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x30, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.HVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVZXBD = new VexRMOp("VPMOVZXBD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x31, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVZXBQ = new VexRMOp("VPMOVZXBQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x32, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.OVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVZXWD = new VexRMOp("VPMOVZXWD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x33, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVZXWQ = new VexRMOp("VPMOVZXWQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x34, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.QVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPMOVZXDQ = new VexRMOp("VPMOVZXDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x35, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPTEST = new VexRMOp("VPTEST", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x17); + public static final VexRMOp VSQRTPD = new VexRMOp("VSQRTPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMOp VSQRTPS = new VexRMOp("VSQRTPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VUCOMISS = new VexRMOp("VUCOMISS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x2E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRMOp VUCOMISD = new VexRMOp("VUCOMISD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x2E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRMOp VPABSB = new VexRMOp("VPABSB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x1C, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPABSW = new VexRMOp("VPABSW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x1D, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRMOp VPABSD = new VexRMOp("VPABSD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x1E, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMOp VPABSQ = new VexRMOp("VPABSQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x1F, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + + public static final VexRMOp VCVTPH2PS = new VexRMOp("VCVTPH2PS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x13, VEXOpAssertion.F16C_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.W0); // @formatter:on protected VexRMOp(String opcode, int pp, int mmmmm, int w, int op) { - this(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1, EVEXTuple.INVALID, WIG); + this(opcode, pp, mmmmm, w, op, VEXOpAssertion.AVX1, EVEXTuple.INVALID, VEXPrefixConfig.WIG); } protected VexRMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { - this(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, WIG); + this(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, VEXPrefixConfig.WIG); } protected VexRMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { super(opcode, pp, mmmmm, w, op, assertion, evexTuple, wEvex); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src) { - emit(asm, size, dst, src, Register.None, Z0, B0); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src) { + emit(asm, size, dst, src, Register.None, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); asm.vexPrefix(dst, Register.None, src, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); asm.emitModRM(dst, src); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(dst, Register.None, src, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); @@ -1401,7 +1375,7 @@ protected VexGeneralMoveOp(String opcode, int pp, int mmmmm, int w, int op, VEXO super(opcode, pp, mmmmm, w, op, assertion, evexTuple, wEvex); } - public abstract void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register src); + public abstract void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register src); } /** @@ -1412,19 +1386,19 @@ protected VexGeneralMoveOp(String opcode, int pp, int mmmmm, int w, int op, VEXO */ public static final class VexMoveOp extends VexGeneralMoveOp { // @formatter:off - public static final VexMoveOp VMOVDQA32 = new VexMoveOp("VMOVDQA32", P_66, M_0F, WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexMoveOp VMOVDQA64 = new VexMoveOp("VMOVDQA64", P_66, M_0F, WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexMoveOp VMOVDQU32 = new VexMoveOp("VMOVDQU32", P_F3, M_0F, WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexMoveOp VMOVDQU64 = new VexMoveOp("VMOVDQU64", P_F3, M_0F, WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexMoveOp VMOVAPS = new VexMoveOp("VMOVAPS", P_, M_0F, WIG, 0x28, 0x29, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexMoveOp VMOVAPD = new VexMoveOp("VMOVAPD", P_66, M_0F, WIG, 0x28, 0x29, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexMoveOp VMOVUPS = new VexMoveOp("VMOVUPS", P_, M_0F, WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexMoveOp VMOVUPD = new VexMoveOp("VMOVUPD", P_66, M_0F, WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); + public static final VexMoveOp VMOVDQA32 = new VexMoveOp("VMOVDQA32", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexMoveOp VMOVDQA64 = new VexMoveOp("VMOVDQA64", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexMoveOp VMOVDQU32 = new VexMoveOp("VMOVDQU32", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexMoveOp VMOVDQU64 = new VexMoveOp("VMOVDQU64", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x6F, 0x7F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexMoveOp VMOVAPS = new VexMoveOp("VMOVAPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x28, 0x29, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexMoveOp VMOVAPD = new VexMoveOp("VMOVAPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x28, 0x29, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexMoveOp VMOVUPS = new VexMoveOp("VMOVUPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexMoveOp VMOVUPD = new VexMoveOp("VMOVUPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); // VMOVSS and VMOVSD are RVM instructions when both src and dest are registers. - public static final VexMoveOp VMOVSS = new VexMoveOp("VMOVSS", P_F3, M_0F, WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.T1S_32BIT, W0); - public static final VexMoveOp VMOVSD = new VexMoveOp("VMOVSD", P_F2, M_0F, WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.T1S_64BIT, W1); - public static final VexMoveOp VMOVD = new VexMoveOp("VMOVD", P_66, M_0F, W0, 0x6E, 0x7E, VEXOpAssertion.XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexMoveOp VMOVQ = new VexMoveOp("VMOVQ", P_66, M_0F, W1, 0x6E, 0x7E, VEXOpAssertion.XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); + public static final VexMoveOp VMOVSS = new VexMoveOp("VMOVSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexMoveOp VMOVSD = new VexMoveOp("VMOVSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x10, 0x11, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexMoveOp VMOVD = new VexMoveOp("VMOVD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0x6E, 0x7E, VEXOpAssertion.XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexMoveOp VMOVQ = new VexMoveOp("VMOVQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x6E, 0x7E, VEXOpAssertion.XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); // @formatter:on private final int opReverse; @@ -1435,14 +1409,14 @@ private VexMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opReverse } @Override - public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(src, Register.None, dst, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(opReverse); asm.emitOperandHelper(src, dst, 0, getDisp8Scale(useEvex, size)); } - public void emitReverse(AMD64Assembler asm, AVXSize size, Register dst, Register src) { + public void emitReverse(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, dst), "emitting invalid instruction"); asm.vexPrefix(src, Register.None, dst, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(opReverse); @@ -1450,7 +1424,7 @@ public void emitReverse(AMD64Assembler asm, AVXSize size, Register dst, Register } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); // MOVSS/SD are RVM instruction when both operands are registers Register nds = (this == VMOVSS || this == VMOVSD) ? src : Register.None; @@ -1460,7 +1434,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); // MOVSS/SD are RVM instruction when both operands are registers Register nds = (this == VMOVSS || this == VMOVSD) ? src : Register.None; @@ -1472,7 +1446,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, R } public interface VexRRIOp { - void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8); + void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8); } /** @@ -1480,17 +1454,17 @@ public interface VexRRIOp { */ public static class VexRMIOp extends VexOp implements VexRRIOp { // @formatter:off - public static final VexRMIOp VAESKEYGENASSIST = new VexRMIOp("VAESKEYGENASSIST", P_66, M_0F3A, WIG, 0xDF, VEXOpAssertion.AVX1_128ONLY_AES); - public static final VexRMIOp VPERMQ = new VexRMIOp("VPERMQ", P_66, M_0F3A, W1, 0x00, VEXOpAssertion.AVX2_AVX512F_VL_256_512, EVEXTuple.FVM, W1); - public static final VexRMIOp VPSHUFLW = new VexRMIOp("VPSHUFLW", P_F2, M_0F, WIG, 0x70, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRMIOp VPSHUFHW = new VexRMIOp("VPSHUFHW", P_F3, M_0F, WIG, 0x70, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRMIOp VPSHUFD = new VexRMIOp("VPSHUFD", P_66, M_0F, WIG, 0x70, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRMIOp RORXL = new VexRMIOp("RORXL", P_F2, M_0F3A, W0, 0xF0, VEXOpAssertion.BMI2); - public static final VexRMIOp RORXQ = new VexRMIOp("RORXQ", P_F2, M_0F3A, W1, 0xF0, VEXOpAssertion.BMI2); + public static final VexRMIOp VAESKEYGENASSIST = new VexRMIOp("VAESKEYGENASSIST", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.WIG, 0xDF, VEXOpAssertion.AVX1_128ONLY_AES); + public static final VexRMIOp VPERMQ = new VexRMIOp("VPERMQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x00, VEXOpAssertion.AVX2_AVX512F_VL_256_512, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRMIOp VPSHUFLW = new VexRMIOp("VPSHUFLW", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x70, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRMIOp VPSHUFHW = new VexRMIOp("VPSHUFHW", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x70, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRMIOp VPSHUFD = new VexRMIOp("VPSHUFD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x70, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRMIOp RORXL = new VexRMIOp("RORXL", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0xF0, VEXOpAssertion.BMI2); + public static final VexRMIOp RORXQ = new VexRMIOp("RORXQ", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0xF0, VEXOpAssertion.BMI2); // @formatter:on protected VexRMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { - super(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, WIG); + super(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, VEXPrefixConfig.WIG); } protected VexRMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { @@ -1498,7 +1472,7 @@ protected VexRMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAsserti } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); asm.vexPrefix(dst, Register.None, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -1506,7 +1480,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(dst, Register.None, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -1514,7 +1488,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address sr asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); asm.evexPrefix(dst, mask, Register.None, src, size, pp, mmmmm, wEvex, z, b); asm.emitByte(op); @@ -1522,7 +1496,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, int imm8, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src, int imm8, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); asm.evexPrefix(dst, mask, Register.None, src, size, pp, mmmmm, wEvex, z, b); asm.emitByte(op); @@ -1536,8 +1510,8 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address sr */ public static final class EvexRMIOp extends VexRMIOp { // @formatter:off - public static final EvexRMIOp VFPCLASSSS = new EvexRMIOp("VFPCLASS", P_66, M_0F3A, W0, 0x67, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ, EVEXTuple.T1S_32BIT, W0); - public static final EvexRMIOp VFPCLASSSD = new EvexRMIOp("VFPCLASD", P_66, M_0F3A, W1, 0x67, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ, EVEXTuple.T1S_64BIT, W1); + public static final EvexRMIOp VFPCLASSSS = new EvexRMIOp("VFPCLASS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x67, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final EvexRMIOp VFPCLASSSD = new EvexRMIOp("VFPCLASD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x67, VEXOpAssertion.MASK_NULL_XMM_AVX512DQ, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); // @formatter:on private EvexRMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { @@ -1545,15 +1519,15 @@ private EvexRMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertio } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); - emit(asm, size, dst, src, imm8, Register.None, Z0, B0); + emit(asm, size, dst, src, imm8, Register.None, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); - emit(asm, size, dst, src, imm8, Register.None, Z0, B0); + emit(asm, size, dst, src, imm8, Register.None, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); } } @@ -1562,7 +1536,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address sr */ public static final class VexMROp extends VexRROp { // @formatter:off - public static final VexMROp VPCOMPRESSD = new VexMROp("VPCOMPRESSD", P_66, M_0F38, W0, 0x8B, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, W0); + public static final VexMROp VPCOMPRESSD = new VexMROp("VPCOMPRESSD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x8B, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); // @formatter:on private VexMROp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { @@ -1570,14 +1544,14 @@ private VexMROp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, dst), "emitting invalid instruction"); asm.vexPrefix(src, Register.None, dst, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); asm.emitModRM(src, dst); } - public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(src, Register.None, dst, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); @@ -1590,28 +1564,28 @@ public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register sr */ public static final class VexMRIOp extends VexOp implements VexRRIOp { // @formatter:off - public static final VexMRIOp VPEXTRB = new VexMRIOp("VPEXTRB", P_66, M_0F3A, W0, 0x14, VEXOpAssertion.XMM_CPU); - public static final VexMRIOp VPEXTRW = new VexMRIOp("VPEXTRW", P_66, M_0F3A, W0, 0x15, VEXOpAssertion.XMM_CPU); - public static final VexMRIOp VPEXTRD = new VexMRIOp("VPEXTRD", P_66, M_0F3A, W0, 0x16, VEXOpAssertion.XMM_CPU); - public static final VexMRIOp VPEXTRQ = new VexMRIOp("VPEXTRQ", P_66, M_0F3A, W1, 0x16, VEXOpAssertion.XMM_CPU); + public static final VexMRIOp VPEXTRB = new VexMRIOp("VPEXTRB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x14, VEXOpAssertion.XMM_CPU); + public static final VexMRIOp VPEXTRW = new VexMRIOp("VPEXTRW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x15, VEXOpAssertion.XMM_CPU); + public static final VexMRIOp VPEXTRD = new VexMRIOp("VPEXTRD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x16, VEXOpAssertion.XMM_CPU); + public static final VexMRIOp VPEXTRQ = new VexMRIOp("VPEXTRQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x16, VEXOpAssertion.XMM_CPU); // AVX/AVX2 128-bit extract - public static final VexMRIOp VEXTRACTF128 = new VexMRIOp("VEXTRACTF128", P_66, M_0F3A, W0, 0x19, VEXOpAssertion.AVX1_256ONLY); - public static final VexMRIOp VEXTRACTI128 = new VexMRIOp("VEXTRACTI128", P_66, M_0F3A, W0, 0x39, VEXOpAssertion.AVX2_256ONLY); + public static final VexMRIOp VEXTRACTF128 = new VexMRIOp("VEXTRACTF128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x19, VEXOpAssertion.AVX1_256ONLY); + public static final VexMRIOp VEXTRACTI128 = new VexMRIOp("VEXTRACTI128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x39, VEXOpAssertion.AVX2_256ONLY); // AVX-512 extract - public static final VexMRIOp VEXTRACTF32X4 = new VexMRIOp("VEXTRACTF32X4", P_66, M_0F3A, W0, 0x19, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, W0); - public static final VexMRIOp VEXTRACTI32X4 = new VexMRIOp("VEXTRACTI32X4", P_66, M_0F3A, W0, 0x39, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, W0); - public static final VexMRIOp VEXTRACTF64X2 = new VexMRIOp("VEXTRACTF64X2", P_66, M_0F3A, W1, 0x19, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, W1); - public static final VexMRIOp VEXTRACTI64X2 = new VexMRIOp("VEXTRACTI64X2", P_66, M_0F3A, W1, 0x39, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, W1); + public static final VexMRIOp VEXTRACTF32X4 = new VexMRIOp("VEXTRACTF32X4", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x19, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, VEXPrefixConfig.W0); + public static final VexMRIOp VEXTRACTI32X4 = new VexMRIOp("VEXTRACTI32X4", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x39, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, VEXPrefixConfig.W0); + public static final VexMRIOp VEXTRACTF64X2 = new VexMRIOp("VEXTRACTF64X2", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x19, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, VEXPrefixConfig.W1); + public static final VexMRIOp VEXTRACTI64X2 = new VexMRIOp("VEXTRACTI64X2", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x39, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, VEXPrefixConfig.W1); - public static final VexMRIOp VEXTRACTF32X8 = new VexMRIOp("VEXTRACTF32X8", P_66, M_0F3A, W0, 0x1B, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, W0); - public static final VexMRIOp VEXTRACTI32X8 = new VexMRIOp("VEXTRACTI32X8", P_66, M_0F3A, W0, 0x3B, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, W0); - public static final VexMRIOp VEXTRACTF64X4 = new VexMRIOp("VEXTRACTF64X2", P_66, M_0F3A, W1, 0x1B, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, W1); - public static final VexMRIOp VEXTRACTI64X4 = new VexMRIOp("VEXTRACTI64X2", P_66, M_0F3A, W1, 0x3B, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, W1); + public static final VexMRIOp VEXTRACTF32X8 = new VexMRIOp("VEXTRACTF32X8", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x1B, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, VEXPrefixConfig.W0); + public static final VexMRIOp VEXTRACTI32X8 = new VexMRIOp("VEXTRACTI32X8", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x3B, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, VEXPrefixConfig.W0); + public static final VexMRIOp VEXTRACTF64X4 = new VexMRIOp("VEXTRACTF64X2", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x1B, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, VEXPrefixConfig.W1); + public static final VexMRIOp VEXTRACTI64X4 = new VexMRIOp("VEXTRACTI64X2", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x3B, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, VEXPrefixConfig.W1); // Half precision floating-point values conversion - public static final VexMRIOp VCVTPS2PH = new VexMRIOp("VCVTPS2PH", P_66, M_0F3A, W0, 0x1D, VEXOpAssertion.F16C_AVX512F_VL, EVEXTuple.HVM, W0); + public static final VexMRIOp VCVTPS2PH = new VexMRIOp("VCVTPS2PH", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x1D, VEXOpAssertion.F16C_AVX512F_VL, EVEXTuple.HVM, VEXPrefixConfig.W0); // @formatter:on private VexMRIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { @@ -1623,7 +1597,7 @@ private VexMRIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, dst), "emitting invalid instruction"); asm.vexPrefix(src, Register.None, dst, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -1631,7 +1605,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(src, Register.None, dst, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -1639,7 +1613,7 @@ public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register sr asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, dst), "emitting invalid instruction"); asm.vexPrefix(src, Register.None, dst, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); @@ -1647,7 +1621,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register src, int imm8, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register src, int imm8, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(src, Register.None, dst, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); @@ -1661,16 +1635,16 @@ public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register sr */ public static class VexRVMROp extends VexOp { // @formatter:off - public static final VexRVMROp VPBLENDVB = new VexRVMROp("VPBLENDVB", P_66, M_0F3A, W0, 0x4C, VEXOpAssertion.AVX1_2); - public static final VexRVMROp VBLENDVPS = new VexRVMROp("VBLENDVPS", P_66, M_0F3A, W0, 0x4A, VEXOpAssertion.AVX1); - public static final VexRVMROp VBLENDVPD = new VexRVMROp("VBLENDVPD", P_66, M_0F3A, W0, 0x4B, VEXOpAssertion.AVX1); + public static final VexRVMROp VPBLENDVB = new VexRVMROp("VPBLENDVB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x4C, VEXOpAssertion.AVX1_2); + public static final VexRVMROp VBLENDVPS = new VexRVMROp("VBLENDVPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x4A, VEXOpAssertion.AVX1); + public static final VexRVMROp VBLENDVPD = new VexRVMROp("VBLENDVPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x4B, VEXOpAssertion.AVX1); // @formatter:on protected VexRVMROp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { super(opcode, pp, mmmmm, w, op, assertion); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register mask, Register src1, Register src2) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register mask, Register src1, Register src2) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, mask, src1, src2), "emitting invalid instruction"); asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -1678,7 +1652,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register mask, asm.emitByte(mask.encoding() << 4); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register mask, Register src1, AMD64Address src2) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register mask, Register src1, AMD64Address src2) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, mask, src1, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -1692,114 +1666,114 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register mask, */ public static class VexRVMOp extends VexOp { // @formatter:off - public static final VexRVMOp VANDPS = new VexRVMOp("VANDPS", P_, M_0F, WIG, 0x54, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VANDPD = new VexRVMOp("VANDPD", P_66, M_0F, WIG, 0x54, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VANDNPS = new VexRVMOp("VANDNPS", P_, M_0F, WIG, 0x55, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VANDNPD = new VexRVMOp("VANDNPD", P_66, M_0F, WIG, 0x55, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VORPS = new VexRVMOp("VORPS", P_, M_0F, WIG, 0x56, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VORPD = new VexRVMOp("VORPD", P_66, M_0F, WIG, 0x56, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VXORPS = new VexRVMOp("VXORPS", P_, M_0F, WIG, 0x57, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VXORPD = new VexRVMOp("VXORPD", P_66, M_0F, WIG, 0x57, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VADDPS = new VexRVMOp("VADDPS", P_, M_0F, WIG, 0x58, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VADDPD = new VexRVMOp("VADDPD", P_66, M_0F, WIG, 0x58, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VADDSS = new VexRVMOp("VADDSS", P_F3, M_0F, WIG, 0x58, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VADDSD = new VexRVMOp("VADDSD", P_F2, M_0F, WIG, 0x58,VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VMULPS = new VexRVMOp("VMULPS", P_, M_0F, WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VMULPD = new VexRVMOp("VMULPD", P_66, M_0F, WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VMULSS = new VexRVMOp("VMULSS", P_F3, M_0F, WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VMULSD = new VexRVMOp("VMULSD", P_F2, M_0F, WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VSUBPS = new VexRVMOp("VSUBPS", P_, M_0F, WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VSUBPD = new VexRVMOp("VSUBPD", P_66, M_0F, WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VSUBSS = new VexRVMOp("VSUBSS", P_F3, M_0F, WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VSUBSD = new VexRVMOp("VSUBSD", P_F2, M_0F, WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VMINPS = new VexRVMOp("VMINPS", P_, M_0F, WIG, 0x5D, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VMINPD = new VexRVMOp("VMINPD", P_66, M_0F, WIG, 0x5D, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VMINSS = new VexRVMOp("VMINSS", P_F3, M_0F, WIG, 0x5D, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VMINSD = new VexRVMOp("VMINSD", P_F2, M_0F, WIG, 0x5D, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VDIVPS = new VexRVMOp("VDIVPS", P_, M_0F, WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VDIVPD = new VexRVMOp("VDIVPD", P_66, M_0F, WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VDIVSS = new VexRVMOp("VDIVSS", P_F3, M_0F, WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VDIVSD = new VexRVMOp("VDIVSD", P_F2, M_0F, WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VMAXPS = new VexRVMOp("VMAXPS", P_, M_0F, WIG, 0x5F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VMAXPD = new VexRVMOp("VMAXPD", P_66, M_0F, WIG, 0x5F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VMAXSS = new VexRVMOp("VMAXSS", P_F3, M_0F, WIG, 0x5F, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VMAXSD = new VexRVMOp("VMAXSD", P_F2, M_0F, WIG, 0x5F, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VPACKUSDW = new VexRVMOp("VPACKUSDW", P_66, M_0F38, W0, 0x2B, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPACKUSWB = new VexRVMOp("VPACKUSWB", P_66, M_0F, WIG, 0x67, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VADDSUBPS = new VexRVMOp("VADDSUBPS", P_F2, M_0F, WIG, 0xD0, VEXOpAssertion.AVX1); - public static final VexRVMOp VADDSUBPD = new VexRVMOp("VADDSUBPD", P_66, M_0F, WIG, 0xD0, VEXOpAssertion.AVX1); - public static final VexRVMOp VPAND = new VexRVMOp("VPAND", P_66, M_0F, WIG, 0xDB, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPANDN = new VexRVMOp("VPANDN", P_66, M_0F, WIG, 0xDF, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPOR = new VexRVMOp("VPOR", P_66, M_0F, WIG, 0xEB, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPXOR = new VexRVMOp("VPXOR", P_66, M_0F, WIG, 0xEF, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPADDB = new VexRVMOp("VPADDB", P_66, M_0F, WIG, 0xFC, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPADDW = new VexRVMOp("VPADDW", P_66, M_0F, WIG, 0xFD, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPADDD = new VexRVMOp("VPADDD", P_66, M_0F, WIG, 0xFE, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPADDQ = new VexRVMOp("VPADDQ", P_66, M_0F, WIG, 0xD4, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPMAXSB = new VexRVMOp("VPMAXSB", P_66, M_0F38, WIG, 0x3C, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMAXSW = new VexRVMOp("VPMAXSW", P_66, M_0F, WIG, 0xEE, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMAXSD = new VexRVMOp("VPMAXSD", P_66, M_0F38, WIG, 0x3D, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMAXSQ = new VexRVMOp("VPMAXSQ", P_66, M_0F38, W1, 0x3D, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPMAXUB = new VexRVMOp("VPMAXUB", P_66, M_0F, W0, 0xDE, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMAXUW = new VexRVMOp("VPMAXUW", P_66, M_0F38, W0, 0x3E, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMAXUD = new VexRVMOp("VPMAXUD", P_66, M_0F38, WIG, 0x3F, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMAXUQ = new VexRVMOp("VPMAXUQ", P_66, M_0F38, W1, 0x3F, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPMINSB = new VexRVMOp("VPMINSB", P_66, M_0F38, WIG, 0x38, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMINSW = new VexRVMOp("VPMINSW", P_66, M_0F, WIG, 0xEA, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMINSD = new VexRVMOp("VPMINSD", P_66, M_0F38, WIG, 0x39, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMINSQ = new VexRVMOp("VPMINSQ", P_66, M_0F38, W1, 0x39, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPMINUB = new VexRVMOp("VPMINUB", P_66, M_0F, W0, 0xDA, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMINUW = new VexRVMOp("VPMINUW", P_66, M_0F38, W0, 0x3A, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMINUD = new VexRVMOp("VPMINUD", P_66, M_0F38, WIG, 0x3B, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMINUQ = new VexRVMOp("VPMINUQ", P_66, M_0F38, W1, 0x3B, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPMULHUW = new VexRVMOp("VPMULHUW", P_66, M_0F, WIG, 0xE4, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMULHW = new VexRVMOp("VPMULHW", P_66, M_0F, WIG, 0xE5, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMULLW = new VexRVMOp("VPMULLW", P_66, M_0F, WIG, 0xD5, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPMULLD = new VexRVMOp("VPMULLD", P_66, M_0F38, WIG, 0x40, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPMULLQ = new VexRVMOp("VPMULLQ", P_66, M_0F38, W1, 0x40, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPSUBUSB = new VexRVMOp("VPSUBUSB", P_66, M_0F, WIG, 0xD8, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPSUBUSW = new VexRVMOp("VPSUBUSW", P_66, M_0F, WIG, 0xD9, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPSUBB = new VexRVMOp("VPSUBB", P_66, M_0F, WIG, 0xF8, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPSUBW = new VexRVMOp("VPSUBW", P_66, M_0F, WIG, 0xF9, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPSUBD = new VexRVMOp("VPSUBD", P_66, M_0F, WIG, 0xFA, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPSUBQ = new VexRVMOp("VPSUBQ", P_66, M_0F, WIG, 0xFB, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPSHUFB = new VexRVMOp("VPSHUFB", P_66, M_0F38, WIG, 0x00, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPCMPEQB = new VexRVMOp("VPCMPEQB", P_66, M_0F, WIG, 0x74, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPEQB_AVX512 = new VexRVMOp("VPCMPEQB", P_66, M_0F, WIG, 0x74, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPCMPEQW = new VexRVMOp("VPCMPEQW", P_66, M_0F, WIG, 0x75, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPEQW_AVX512 = new VexRVMOp("VPCMPEQW", P_66, M_0F, WIG, 0x75, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPCMPEQD = new VexRVMOp("VPCMPEQD", P_66, M_0F, WIG, 0x76, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPEQD_AVX512 = new VexRVMOp("VPCMPEQD", P_66, M_0F, WIG, 0x76, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPCMPEQQ = new VexRVMOp("VPCMPEQQ", P_66, M_0F38, WIG, 0x29, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPEQQ_AVX512 = new VexRVMOp("VPCMPEQQ", P_66, M_0F38, WIG, 0x29, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPCMPGTB = new VexRVMOp("VPCMPGTB", P_66, M_0F, WIG, 0x64, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPGTB_AVX512 = new VexRVMOp("VPCMPGTB", P_66, M_0F, WIG, 0x64, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPCMPGTW = new VexRVMOp("VPCMPGTW", P_66, M_0F, WIG, 0x65, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPGTW_AVX512 = new VexRVMOp("VPCMPGTW", P_66, M_0F, WIG, 0x65, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexRVMOp VPCMPGTD = new VexRVMOp("VPCMPGTD", P_66, M_0F, WIG, 0x66, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPGTD_AVX512 = new VexRVMOp("VPCMPGTD", P_66, M_0F, WIG, 0x66, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPCMPGTQ = new VexRVMOp("VPCMPGTQ", P_66, M_0F38, WIG, 0x37, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPCMPGTQ_AVX512 = new VexRVMOp("VPCMPGTQ", P_66, M_0F38, WIG, 0x37, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VFMADD231SS = new VexRVMOp("VFMADD231SS", P_66, M_0F38, W0, 0xB9, VEXOpAssertion.FMA_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMOp VFMADD231SD = new VexRVMOp("VFMADD231SD", P_66, M_0F38, W1, 0xB9, VEXOpAssertion.FMA_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMOp VSQRTSD = new VexRVMOp("VSQRTSD", P_F2, M_0F, WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.FVM, W1); - public static final VexRVMOp VSQRTSS = new VexRVMOp("VSQRTSS", P_F3, M_0F, WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.FVM, W0); - - public static final VexRVMOp VPERMW = new VexRVMOp("VPERMW", P_66, M_0F38, W1, 0x8D, VEXOpAssertion.AVX512BW_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPERMD = new VexRVMOp("VPERMD", P_66, M_0F38, W0, 0x36, VEXOpAssertion.AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - - public static final VexRVMOp VPBLENDMB = new VexRVMOp("VPBLENDMB", P_66, M_0F38, W0, 0x66, VEXOpAssertion.AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPBLENDMW = new VexRVMOp("VPBLENDMW", P_66, M_0F38, W1, 0x66, VEXOpAssertion.AVX512BW_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPBLENDMD = new VexRVMOp("VPBLENDMD", P_66, M_0F38, W0, 0x64, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VPBLENDMQ = new VexRVMOp("VPBLENDMQ", P_66, M_0F38, W1, 0x64, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VBLENDMPS = new VexRVMOp("VBLENDMPS", P_66, M_0F38, W0, 0x65, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMOp VBLENDMPD = new VexRVMOp("VBLENDMPD", P_66, M_0F38, W1, 0x65, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMOp VPERMT2B = new VexRVMOp("VPERMT2B", P_66, M_0F38, W0, 0x7D, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W0); - - public static final VexRVMOp MOVLHPS = new VexRVMOp("MOVLHPS", P_, M_0F, WIG, 0x16, VEXOpAssertion.XMM_XMM_XMM_AVX512F_128ONLY, EVEXTuple.FVM, W0); - - public static final VexRVMOp VPHADDW = new VexRVMOp("VPHADDW", P_66, M_0F38, WIG, 0x01, VEXOpAssertion.AVX1_2); - public static final VexRVMOp VPHADDD = new VexRVMOp("VPHADDD", P_66, M_0F38, WIG, 0x02, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VANDPS = new VexRVMOp("VANDPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x54, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VANDPD = new VexRVMOp("VANDPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x54, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VANDNPS = new VexRVMOp("VANDNPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x55, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VANDNPD = new VexRVMOp("VANDNPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x55, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VORPS = new VexRVMOp("VORPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x56, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VORPD = new VexRVMOp("VORPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x56, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VXORPS = new VexRVMOp("VXORPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x57, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VXORPD = new VexRVMOp("VXORPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x57, VEXOpAssertion.AVX1_AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VADDPS = new VexRVMOp("VADDPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x58, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VADDPD = new VexRVMOp("VADDPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x58, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VADDSS = new VexRVMOp("VADDSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x58, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VADDSD = new VexRVMOp("VADDSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x58,VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VMULPS = new VexRVMOp("VMULPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VMULPD = new VexRVMOp("VMULPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VMULSS = new VexRVMOp("VMULSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VMULSD = new VexRVMOp("VMULSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x59, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VSUBPS = new VexRVMOp("VSUBPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VSUBPD = new VexRVMOp("VSUBPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VSUBSS = new VexRVMOp("VSUBSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VSUBSD = new VexRVMOp("VSUBSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5C, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VMINPS = new VexRVMOp("VMINPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5D, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VMINPD = new VexRVMOp("VMINPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5D, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VMINSS = new VexRVMOp("VMINSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5D, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VMINSD = new VexRVMOp("VMINSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5D, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VDIVPS = new VexRVMOp("VDIVPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VDIVPD = new VexRVMOp("VDIVPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VDIVSS = new VexRVMOp("VDIVSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VDIVSD = new VexRVMOp("VDIVSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5E, VEXOpAssertion.AVX1_AVX512F_128_ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VMAXPS = new VexRVMOp("VMAXPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VMAXPD = new VexRVMOp("VMAXPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5F, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VMAXSS = new VexRVMOp("VMAXSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5F, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VMAXSD = new VexRVMOp("VMAXSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5F, VEXOpAssertion.AVX1_128ONLY_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VPACKUSDW = new VexRVMOp("VPACKUSDW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x2B, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPACKUSWB = new VexRVMOp("VPACKUSWB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x67, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VADDSUBPS = new VexRVMOp("VADDSUBPS", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD0, VEXOpAssertion.AVX1); + public static final VexRVMOp VADDSUBPD = new VexRVMOp("VADDSUBPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD0, VEXOpAssertion.AVX1); + public static final VexRVMOp VPAND = new VexRVMOp("VPAND", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xDB, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPANDN = new VexRVMOp("VPANDN", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xDF, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPOR = new VexRVMOp("VPOR", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xEB, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPXOR = new VexRVMOp("VPXOR", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xEF, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPADDB = new VexRVMOp("VPADDB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xFC, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPADDW = new VexRVMOp("VPADDW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xFD, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPADDD = new VexRVMOp("VPADDD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xFE, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPADDQ = new VexRVMOp("VPADDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD4, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPMAXSB = new VexRVMOp("VPMAXSB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x3C, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMAXSW = new VexRVMOp("VPMAXSW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xEE, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMAXSD = new VexRVMOp("VPMAXSD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x3D, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMAXSQ = new VexRVMOp("VPMAXSQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x3D, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPMAXUB = new VexRVMOp("VPMAXUB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0xDE, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMAXUW = new VexRVMOp("VPMAXUW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x3E, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMAXUD = new VexRVMOp("VPMAXUD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x3F, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMAXUQ = new VexRVMOp("VPMAXUQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x3F, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPMINSB = new VexRVMOp("VPMINSB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x38, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMINSW = new VexRVMOp("VPMINSW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xEA, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMINSD = new VexRVMOp("VPMINSD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x39, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMINSQ = new VexRVMOp("VPMINSQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x39, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPMINUB = new VexRVMOp("VPMINUB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0xDA, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMINUW = new VexRVMOp("VPMINUW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x3A, VEXOpAssertion.AVX1_AVX2_AVX512F_BW, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMINUD = new VexRVMOp("VPMINUD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x3B, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMINUQ = new VexRVMOp("VPMINUQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x3B, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPMULHUW = new VexRVMOp("VPMULHUW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xE4, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMULHW = new VexRVMOp("VPMULHW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xE5, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMULLW = new VexRVMOp("VPMULLW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD5, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPMULLD = new VexRVMOp("VPMULLD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x40, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPMULLQ = new VexRVMOp("VPMULLQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x40, VEXOpAssertion.AVX512DQ_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPSUBUSB = new VexRVMOp("VPSUBUSB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD8, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPSUBUSW = new VexRVMOp("VPSUBUSW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD9, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPSUBB = new VexRVMOp("VPSUBB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xF8, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPSUBW = new VexRVMOp("VPSUBW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xF9, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPSUBD = new VexRVMOp("VPSUBD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xFA, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPSUBQ = new VexRVMOp("VPSUBQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xFB, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPSHUFB = new VexRVMOp("VPSHUFB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x00, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPCMPEQB = new VexRVMOp("VPCMPEQB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x74, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPEQB_AVX512 = new VexRVMOp("VPCMPEQB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x74, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPCMPEQW = new VexRVMOp("VPCMPEQW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x75, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPEQW_AVX512 = new VexRVMOp("VPCMPEQW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x75, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPCMPEQD = new VexRVMOp("VPCMPEQD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x76, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPEQD_AVX512 = new VexRVMOp("VPCMPEQD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x76, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPCMPEQQ = new VexRVMOp("VPCMPEQQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x29, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPEQQ_AVX512 = new VexRVMOp("VPCMPEQQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x29, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPCMPGTB = new VexRVMOp("VPCMPGTB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x64, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPGTB_AVX512 = new VexRVMOp("VPCMPGTB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x64, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPCMPGTW = new VexRVMOp("VPCMPGTW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x65, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPGTW_AVX512 = new VexRVMOp("VPCMPGTW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x65, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexRVMOp VPCMPGTD = new VexRVMOp("VPCMPGTD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x66, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPGTD_AVX512 = new VexRVMOp("VPCMPGTD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x66, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPCMPGTQ = new VexRVMOp("VPCMPGTQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x37, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPCMPGTQ_AVX512 = new VexRVMOp("VPCMPGTQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x37, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VFMADD231SS = new VexRVMOp("VFMADD231SS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0xB9, VEXOpAssertion.FMA_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMOp VFMADD231SD = new VexRVMOp("VFMADD231SD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0xB9, VEXOpAssertion.FMA_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMOp VSQRTSD = new VexRVMOp("VSQRTSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VSQRTSS = new VexRVMOp("VSQRTSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x51, VEXOpAssertion.AVX1_AVX512F_ALL, EVEXTuple.FVM, VEXPrefixConfig.W0); + + public static final VexRVMOp VPERMW = new VexRVMOp("VPERMW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x8D, VEXOpAssertion.AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPERMD = new VexRVMOp("VPERMD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x36, VEXOpAssertion.AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + + public static final VexRVMOp VPBLENDMB = new VexRVMOp("VPBLENDMB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x66, VEXOpAssertion.AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPBLENDMW = new VexRVMOp("VPBLENDMW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x66, VEXOpAssertion.AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPBLENDMD = new VexRVMOp("VPBLENDMD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x64, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VPBLENDMQ = new VexRVMOp("VPBLENDMQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x64, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VBLENDMPS = new VexRVMOp("VBLENDMPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x65, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMOp VBLENDMPD = new VexRVMOp("VBLENDMPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x65, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMOp VPERMT2B = new VexRVMOp("VPERMT2B", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x7D, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + + public static final VexRVMOp MOVLHPS = new VexRVMOp("MOVLHPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x16, VEXOpAssertion.XMM_XMM_XMM_AVX512F_128ONLY, EVEXTuple.FVM, VEXPrefixConfig.W0); + + public static final VexRVMOp VPHADDW = new VexRVMOp("VPHADDW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x01, VEXOpAssertion.AVX1_2); + public static final VexRVMOp VPHADDD = new VexRVMOp("VPHADDD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0x02, VEXOpAssertion.AVX1_2); // @formatter:on protected VexRVMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { @@ -1810,42 +1784,42 @@ private VexRVMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion super(opcode, pp, mmmmm, w, op, assertion, evexTuple, wEvex); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, src2), "emitting invalid instruction"); asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitModRM(dst, src2); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitOperandHelper(dst, src2, 0, getDisp8Scale(useEvex, size)); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Register mask) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2, Register mask) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, src2), "emitting invalid instruction"); - asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, Z0, B0); + asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); asm.emitByte(op); asm.emitModRM(dst, src2); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, null), "emitting invalid instruction"); - boolean useEvex = asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, Z0, B0); + boolean useEvex = asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); asm.emitByte(op); asm.emitOperandHelper(dst, src2, 0, getDisp8Scale(useEvex, size)); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, src2), "emitting invalid instruction"); asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); asm.emitModRM(dst, src2); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); @@ -1853,18 +1827,18 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, } public boolean isPacked() { - return pp == P_ || pp == P_66; + return pp == VEXPrefixConfig.P_ || pp == VEXPrefixConfig.P_66; } } public static final class VexRVMConvertOp extends VexRVMOp { // @formatter:off - public static final VexRVMConvertOp VCVTSD2SS = new VexRVMConvertOp("VCVTSD2SS", P_F2, M_0F, WIG, 0x5A, VEXOpAssertion.XMM_XMM_XMM_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMConvertOp VCVTSS2SD = new VexRVMConvertOp("VCVTSS2SD", P_F3, M_0F, WIG, 0x5A, VEXOpAssertion.XMM_XMM_XMM_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMConvertOp VCVTSI2SD = new VexRVMConvertOp("VCVTSI2SD", P_F2, M_0F, W0, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMConvertOp VCVTSQ2SD = new VexRVMConvertOp("VCVTSQ2SD", P_F2, M_0F, W1, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); - public static final VexRVMConvertOp VCVTSI2SS = new VexRVMConvertOp("VCVTSI2SS", P_F3, M_0F, W0, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, W0); - public static final VexRVMConvertOp VCVTSQ2SS = new VexRVMConvertOp("VCVTSQ2SS", P_F3, M_0F, W1, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, W1); + public static final VexRVMConvertOp VCVTSD2SS = new VexRVMConvertOp("VCVTSD2SS", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5A, VEXOpAssertion.XMM_XMM_XMM_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMConvertOp VCVTSS2SD = new VexRVMConvertOp("VCVTSS2SD", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x5A, VEXOpAssertion.XMM_XMM_XMM_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMConvertOp VCVTSI2SD = new VexRVMConvertOp("VCVTSI2SD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMConvertOp VCVTSQ2SD = new VexRVMConvertOp("VCVTSQ2SD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final VexRVMConvertOp VCVTSI2SS = new VexRVMConvertOp("VCVTSI2SS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexRVMConvertOp VCVTSQ2SS = new VexRVMConvertOp("VCVTSQ2SS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0x2A, VEXOpAssertion.XMM_XMM_CPU_AVX512F_128ONLY, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); // @formatter:on private VexRVMConvertOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { @@ -1874,10 +1848,10 @@ private VexRVMConvertOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAs public static final class VexGeneralPurposeRVMOp extends VexRVMOp { // @formatter:off - public static final VexGeneralPurposeRVMOp ANDN = new VexGeneralPurposeRVMOp("ANDN", P_, M_0F38, WIG, 0xF2, VEXOpAssertion.BMI1); - public static final VexGeneralPurposeRVMOp MULX = new VexGeneralPurposeRVMOp("MULX", P_F2, M_0F38, WIG, 0xF6, VEXOpAssertion.BMI2); - public static final VexGeneralPurposeRVMOp PDEP = new VexGeneralPurposeRVMOp("PDEP", P_F2, M_0F38, WIG, 0xF5, VEXOpAssertion.BMI2); - public static final VexGeneralPurposeRVMOp PEXT = new VexGeneralPurposeRVMOp("PEXT", P_F3, M_0F38, WIG, 0xF5, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRVMOp ANDN = new VexGeneralPurposeRVMOp("ANDN", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF2, VEXOpAssertion.BMI1); + public static final VexGeneralPurposeRVMOp MULX = new VexGeneralPurposeRVMOp("MULX", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF6, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRVMOp PDEP = new VexGeneralPurposeRVMOp("PDEP", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF5, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRVMOp PEXT = new VexGeneralPurposeRVMOp("PEXT", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF5, VEXOpAssertion.BMI2); // @formatter:on private VexGeneralPurposeRVMOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { @@ -1885,37 +1859,39 @@ private VexGeneralPurposeRVMOp(String opcode, int pp, int mmmmm, int w, int op, } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2) { - GraalError.guarantee(assertion.check(asm.getFeatures(), LZ, dst, src1, src2, null), "emitting invalid instruction"); - assert size == AVXSize.DWORD || size == AVXSize.QWORD; - asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2) { + GraalError.guarantee(assertion.check(asm.getFeatures(), VEXPrefixConfig.LZ, dst, src1, src2, null), "emitting invalid instruction"); + assert size == AVXKind.AVXSize.DWORD || size == AVXKind.AVXSize.QWORD; + asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitModRM(dst, src2); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Register mask, int z, int b) { - GraalError.guarantee(assertion.check(asm.getFeatures(), LZ, dst, src1, src2, null), "emitting invalid instruction"); - assert size == AVXSize.DWORD || size == AVXSize.QWORD; - asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2, Register mask, int z, int b) { + GraalError.guarantee(assertion.check(asm.getFeatures(), VEXPrefixConfig.LZ, dst, src1, src2, null), "emitting invalid instruction"); + assert size == AVXKind.AVXSize.DWORD || size == AVXKind.AVXSize.QWORD; + asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, assertion.l256feature, + z, b); asm.emitByte(op); asm.emitModRM(dst, src2); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2) { - GraalError.guarantee(assertion.check(asm.getFeatures(), LZ, dst, src1, null, null), "emitting invalid instruction"); - assert size == AVXSize.DWORD || size == AVXSize.QWORD; - asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2) { + GraalError.guarantee(assertion.check(asm.getFeatures(), VEXPrefixConfig.LZ, dst, src1, null, null), "emitting invalid instruction"); + assert size == AVXKind.AVXSize.DWORD || size == AVXKind.AVXSize.QWORD; + asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitOperandHelper(dst, src2, 0); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask, int z, int b) { - GraalError.guarantee(assertion.check(asm.getFeatures(), LZ, dst, src1, null, null), "emitting invalid instruction"); - assert size == AVXSize.DWORD || size == AVXSize.QWORD; - asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2, Register mask, int z, int b) { + GraalError.guarantee(assertion.check(asm.getFeatures(), VEXPrefixConfig.LZ, dst, src1, null, null), "emitting invalid instruction"); + assert size == AVXKind.AVXSize.DWORD || size == AVXKind.AVXSize.QWORD; + asm.vexPrefix(dst, src1, src2, mask, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, assertion.l256feature, + z, b); asm.emitByte(op); asm.emitOperandHelper(dst, src2, 0); } @@ -1923,29 +1899,29 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, public static final class VexGeneralPurposeRMVOp extends VexOp { // @formatter:off - public static final VexGeneralPurposeRMVOp BEXTR = new VexGeneralPurposeRMVOp("BEXTR", P_, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI1); - public static final VexGeneralPurposeRMVOp BZHI = new VexGeneralPurposeRMVOp("BZHI", P_, M_0F38, WIG, 0xF5, VEXOpAssertion.BMI2); - public static final VexGeneralPurposeRMVOp SARX = new VexGeneralPurposeRMVOp("SARX", P_F3, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI2); - public static final VexGeneralPurposeRMVOp SHRX = new VexGeneralPurposeRMVOp("SHRX", P_F2, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI2); - public static final VexGeneralPurposeRMVOp SHLX = new VexGeneralPurposeRMVOp("SHLX", P_66, M_0F38, WIG, 0xF7, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRMVOp BEXTR = new VexGeneralPurposeRMVOp("BEXTR", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF7, VEXOpAssertion.BMI1); + public static final VexGeneralPurposeRMVOp BZHI = new VexGeneralPurposeRMVOp("BZHI", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF5, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRMVOp SARX = new VexGeneralPurposeRMVOp("SARX", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF7, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRMVOp SHRX = new VexGeneralPurposeRMVOp("SHRX", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF7, VEXOpAssertion.BMI2); + public static final VexGeneralPurposeRMVOp SHLX = new VexGeneralPurposeRMVOp("SHLX", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF7, VEXOpAssertion.BMI2); // @formatter:on private VexGeneralPurposeRMVOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { super(opcode, pp, mmmmm, w, op, assertion); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2) { - GraalError.guarantee(assertion.check(asm.getFeatures(), LZ, dst, src2, src1, null), "emitting invalid instruction"); - assert size == AVXSize.DWORD || size == AVXSize.QWORD; - asm.vexPrefix(dst, src2, src1, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2) { + GraalError.guarantee(assertion.check(asm.getFeatures(), VEXPrefixConfig.LZ, dst, src2, src1, null), "emitting invalid instruction"); + assert size == AVXKind.AVXSize.DWORD || size == AVXKind.AVXSize.QWORD; + asm.vexPrefix(dst, src2, src1, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitModRM(dst, src1); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src1, Register src2) { - GraalError.guarantee(assertion.check(asm.getFeatures(), LZ, dst, src2, null, null), "emitting invalid instruction"); - assert size == AVXSize.DWORD || size == AVXSize.QWORD; - asm.vexPrefix(dst, src2, src1, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature); + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src1, Register src2) { + GraalError.guarantee(assertion.check(asm.getFeatures(), VEXPrefixConfig.LZ, dst, src2, null, null), "emitting invalid instruction"); + assert size == AVXKind.AVXSize.DWORD || size == AVXKind.AVXSize.QWORD; + asm.vexPrefix(dst, src2, src1, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitOperandHelper(dst, src1, 0); } @@ -1961,15 +1937,15 @@ public static final class VexAESOp extends VexRVMOp { private VexAESOp(String opcode, int op, VEXOpAssertion assertion) { // VEX.NDS.128.66.0F38.WIG - w not specified, so ignored. - super(opcode, P_66, M_0F38, WIG, op, assertion); + super(opcode, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, op, assertion); } public void emit(AMD64Assembler asm, Register result, Register state, Register key) { - emit(asm, AVXSize.XMM, result, state, key); + emit(asm, AVXKind.AVXSize.XMM, result, state, key); } public void emit(AMD64Assembler asm, Register result, Register state, AMD64Address keyLocation) { - emit(asm, AVXSize.XMM, result, state, keyLocation); + emit(asm, AVXKind.AVXSize.XMM, result, state, keyLocation); } } @@ -1978,23 +1954,23 @@ public void emit(AMD64Assembler asm, Register result, Register state, AMD64Addre */ public static final class VexGatherOp extends VexOp { // @formatter:off - public static final VexGatherOp VPGATHERDD = new VexGatherOp("VPGATHERDD", P_66, M_0F38, W0, 0x90, VEXOpAssertion.AVX2); - public static final VexGatherOp VPGATHERQD = new VexGatherOp("VPGATHERQD", P_66, M_0F38, W0, 0x91, VEXOpAssertion.AVX2); - public static final VexGatherOp VPGATHERDQ = new VexGatherOp("VPGATHERDQ", P_66, M_0F38, W1, 0x90, VEXOpAssertion.AVX2); - public static final VexGatherOp VPGATHERQQ = new VexGatherOp("VPGATHERQQ", P_66, M_0F38, W1, 0x91, VEXOpAssertion.AVX2); - public static final VexGatherOp VGATHERDPD = new VexGatherOp("VGATHERDPD", P_66, M_0F38, W1, 0x92, VEXOpAssertion.AVX2); - public static final VexGatherOp VGATHERQPD = new VexGatherOp("VGATHERQPD", P_66, M_0F38, W1, 0x93, VEXOpAssertion.AVX2); - public static final VexGatherOp VGATHERDPS = new VexGatherOp("VGATHERDPS", P_66, M_0F38, W0, 0x92, VEXOpAssertion.AVX2); - public static final VexGatherOp VGATHERQPS = new VexGatherOp("VGATHERQPS", P_66, M_0F38, W0, 0x93, VEXOpAssertion.AVX2); + public static final VexGatherOp VPGATHERDD = new VexGatherOp("VPGATHERDD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x90, VEXOpAssertion.AVX2); + public static final VexGatherOp VPGATHERQD = new VexGatherOp("VPGATHERQD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x91, VEXOpAssertion.AVX2); + public static final VexGatherOp VPGATHERDQ = new VexGatherOp("VPGATHERDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x90, VEXOpAssertion.AVX2); + public static final VexGatherOp VPGATHERQQ = new VexGatherOp("VPGATHERQQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x91, VEXOpAssertion.AVX2); + public static final VexGatherOp VGATHERDPD = new VexGatherOp("VGATHERDPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x92, VEXOpAssertion.AVX2); + public static final VexGatherOp VGATHERQPD = new VexGatherOp("VGATHERQPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x93, VEXOpAssertion.AVX2); + public static final VexGatherOp VGATHERDPS = new VexGatherOp("VGATHERDPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x92, VEXOpAssertion.AVX2); + public static final VexGatherOp VGATHERQPS = new VexGatherOp("VGATHERQPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x93, VEXOpAssertion.AVX2); // @formatter:on protected VexGatherOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { - super(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, WIG); + super(opcode, pp, mmmmm, w, op, assertion, EVEXTuple.INVALID, VEXPrefixConfig.WIG); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address address, Register mask) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address address, Register mask) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, mask, null, null), "emitting invalid instruction"); - assert size == AVXSize.XMM || size == AVXSize.YMM; + assert size == AVXKind.AVXSize.XMM || size == AVXKind.AVXSize.YMM; asm.vexPrefix(dst, mask, address, size, pp, mmmmm, w, wEvex, true, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitOperandHelper(dst, address, 0); @@ -2006,23 +1982,23 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address ad */ public static final class EvexGatherOp extends VexOp { // @formatter:off - public static final EvexGatherOp VPGATHERDD = new EvexGatherOp("VPGATHERDD", P_66, M_0F38, 0x90, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, W0); - public static final EvexGatherOp VPGATHERQD = new EvexGatherOp("VPGATHERQD", P_66, M_0F38, 0x91, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, W0); - public static final EvexGatherOp VPGATHERDQ = new EvexGatherOp("VPGATHERDQ", P_66, M_0F38, 0x90, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, W1); - public static final EvexGatherOp VPGATHERQQ = new EvexGatherOp("VPGATHERQQ", P_66, M_0F38, 0x91, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, W1); - public static final EvexGatherOp VGATHERDPD = new EvexGatherOp("VGATHERDPD", P_66, M_0F38, 0x92, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, W1); - public static final EvexGatherOp VGATHERQPD = new EvexGatherOp("VGATHERQPD", P_66, M_0F38, 0x93, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, W1); - public static final EvexGatherOp VGATHERDPS = new EvexGatherOp("VGATHERDPS", P_66, M_0F38, 0x92, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, W0); - public static final EvexGatherOp VGATHERQPS = new EvexGatherOp("VGATHERQPS", P_66, M_0F38, 0x93, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, W0); + public static final EvexGatherOp VPGATHERDD = new EvexGatherOp("VPGATHERDD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x90, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final EvexGatherOp VPGATHERQD = new EvexGatherOp("VPGATHERQD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x91, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final EvexGatherOp VPGATHERDQ = new EvexGatherOp("VPGATHERDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x90, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final EvexGatherOp VPGATHERQQ = new EvexGatherOp("VPGATHERQQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x91, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final EvexGatherOp VGATHERDPD = new EvexGatherOp("VGATHERDPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x92, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final EvexGatherOp VGATHERQPD = new EvexGatherOp("VGATHERQPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x93, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); + public static final EvexGatherOp VGATHERDPS = new EvexGatherOp("VGATHERDPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x92, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final EvexGatherOp VGATHERQPS = new EvexGatherOp("VGATHERQPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, 0x93, VEXOpAssertion.AVX512F_VL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); // @formatter:on protected EvexGatherOp(String opcode, int pp, int mmmmm, int op, VEXOpAssertion assertion, EVEXTuple evexTuple, int wEvex) { super(opcode, pp, mmmmm, wEvex, op, assertion, evexTuple, wEvex); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address address, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address address, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null, null), "emitting invalid instruction"); - assert size == AVXSize.XMM || size == AVXSize.YMM || size == AVXSize.ZMM; + assert size == AVXKind.AVXSize.XMM || size == AVXKind.AVXSize.YMM || size == AVXKind.AVXSize.ZMM; asm.vexPrefix(dst, Register.None, address, mask, size, pp, mmmmm, w, wEvex, true, assertion.l128feature, assertion.l256feature, z, b); asm.emitByte(op); asm.emitOperandHelper(dst, address, 0); @@ -2031,9 +2007,9 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address ad public static final class VexGeneralPurposeRMOp extends VexRMOp { // @formatter:off - public static final VexGeneralPurposeRMOp BLSI = new VexGeneralPurposeRMOp("BLSI", P_, M_0F38, WIG, 0xF3, 3, VEXOpAssertion.BMI1); - public static final VexGeneralPurposeRMOp BLSMSK = new VexGeneralPurposeRMOp("BLSMSK", P_, M_0F38, WIG, 0xF3, 2, VEXOpAssertion.BMI1); - public static final VexGeneralPurposeRMOp BLSR = new VexGeneralPurposeRMOp("BLSR", P_, M_0F38, WIG, 0xF3, 1, VEXOpAssertion.BMI1); + public static final VexGeneralPurposeRMOp BLSI = new VexGeneralPurposeRMOp("BLSI", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF3, 3, VEXOpAssertion.BMI1); + public static final VexGeneralPurposeRMOp BLSMSK = new VexGeneralPurposeRMOp("BLSMSK", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF3, 2, VEXOpAssertion.BMI1); + public static final VexGeneralPurposeRMOp BLSR = new VexGeneralPurposeRMOp("BLSR", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, 0xF3, 1, VEXOpAssertion.BMI1); // @formatter:on private final int ext; @@ -2043,33 +2019,37 @@ private VexGeneralPurposeRMOp(String opcode, int pp, int mmmmm, int w, int op, i } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); - asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature); + asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, + assertion.l256feature); asm.emitByte(op); asm.emitModRM(ext, src); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); - asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, mask, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); + asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, mask, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, + assertion.l256feature, z, b); asm.emitByte(op); asm.emitModRM(ext, src); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); - asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature); + asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, + assertion.l256feature); asm.emitByte(op); asm.emitOperandHelper(ext, src, 0); } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src, Register mask, int z, int b) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src, Register mask, int z, int b) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); - asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, mask, size, pp, mmmmm, size == AVXSize.DWORD ? W0 : W1, wEvex, false, assertion.l128feature, assertion.l256feature, z, b); + asm.vexPrefix(AMD64.cpuRegisters[ext], dst, src, mask, size, pp, mmmmm, size == AVXKind.AVXSize.DWORD ? VEXPrefixConfig.W0 : VEXPrefixConfig.W1, wEvex, false, assertion.l128feature, + assertion.l256feature, z, b); asm.emitByte(op); asm.emitOperandHelper(ext, src, 0); } @@ -2080,15 +2060,15 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address sr */ public static final class VexShiftOp extends VexRVMOp implements VexRRIOp { // @formatter:off - public static final VexShiftOp VPSRLW = new VexShiftOp("VPSRLW", P_66, M_0F, WIG, 0xD1, 0x71, 2, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexShiftOp VPSRLD = new VexShiftOp("VPSRLD", P_66, M_0F, WIG, 0xD2, 0x72, 2, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexShiftOp VPSRLQ = new VexShiftOp("VPSRLQ", P_66, M_0F, WIG, 0xD3, 0x73, 2, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexShiftOp VPSRAW = new VexShiftOp("VPSRAW", P_66, M_0F, WIG, 0xE1, 0x71, 4, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexShiftOp VPSRAD = new VexShiftOp("VPSRAD", P_66, M_0F, WIG, 0xE2, 0x72, 4, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexShiftOp VPSRAQ = new VexShiftOp("VPSRAQ", P_66, M_0F, W1, 0xE2, 0x72, 4, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexShiftOp VPSLLW = new VexShiftOp("VPSLLW", P_66, M_0F, WIG, 0xF1, 0x71, 6, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexShiftOp VPSLLD = new VexShiftOp("VPSLLD", P_66, M_0F, WIG, 0xF2, 0x72, 6, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexShiftOp VPSLLQ = new VexShiftOp("VPSLLQ", P_66, M_0F, WIG, 0xF3, 0x73, 6, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, W1); + public static final VexShiftOp VPSRLW = new VexShiftOp("VPSRLW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD1, 0x71, 2, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexShiftOp VPSRLD = new VexShiftOp("VPSRLD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD2, 0x72, 2, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexShiftOp VPSRLQ = new VexShiftOp("VPSRLQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xD3, 0x73, 2, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexShiftOp VPSRAW = new VexShiftOp("VPSRAW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xE1, 0x71, 4, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexShiftOp VPSRAD = new VexShiftOp("VPSRAD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xE2, 0x72, 4, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexShiftOp VPSRAQ = new VexShiftOp("VPSRAQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0xE2, 0x72, 4, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexShiftOp VPSLLW = new VexShiftOp("VPSLLW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xF1, 0x71, 6, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexShiftOp VPSLLD = new VexShiftOp("VPSLLD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xF2, 0x72, 6, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexShiftOp VPSLLQ = new VexShiftOp("VPSLLQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xF3, 0x73, 6, VEXOpAssertion.AVX1_AVX2_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); // @formatter:on private final int immOp; @@ -2101,7 +2081,7 @@ private VexShiftOp(String opcode, int pp, int mmmmm, int w, int op, int immOp, i } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, null, dst, src), "emitting invalid instruction"); asm.vexPrefix(null, dst, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(immOp); @@ -2112,8 +2092,8 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i public static final class VexShiftImmOp extends VexOp implements VexRRIOp { // @formatter:off - public static final VexShiftImmOp VPSLLDQ = new VexShiftImmOp("VPSLLDQ", P_66, M_0F, WIG, 0x73, 7, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); - public static final VexShiftImmOp VPSRLDQ = new VexShiftImmOp("VPSRLDQ", P_66, M_0F, WIG, 0x73, 3, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); + public static final VexShiftImmOp VPSLLDQ = new VexShiftImmOp("VPSLLDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x73, 7, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); + public static final VexShiftImmOp VPSRLDQ = new VexShiftImmOp("VPSRLDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0x73, 3, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); // @formatter:on private final int r; @@ -2124,7 +2104,7 @@ private VexShiftImmOp(String opcode, int pp, int mmmmm, int w, int op, int r, VE } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, null, dst, src), "emitting invalid instruction"); asm.vexPrefix(null, dst, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -2138,10 +2118,10 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src, i */ public static final class VexMaskedMoveOp extends VexOp { // @formatter:off - public static final VexMaskedMoveOp VMASKMOVPS = new VexMaskedMoveOp("VMASKMOVPS", P_66, M_0F38, W0, 0x2C, 0x2E); - public static final VexMaskedMoveOp VMASKMOVPD = new VexMaskedMoveOp("VMASKMOVPD", P_66, M_0F38, W0, 0x2D, 0x2F); - public static final VexMaskedMoveOp VPMASKMOVD = new VexMaskedMoveOp("VPMASKMOVD", P_66, M_0F38, W0, 0x8C, 0x8E, VEXOpAssertion.AVX2); - public static final VexMaskedMoveOp VPMASKMOVQ = new VexMaskedMoveOp("VPMASKMOVQ", P_66, M_0F38, W1, 0x8C, 0x8E, VEXOpAssertion.AVX2); + public static final VexMaskedMoveOp VMASKMOVPS = new VexMaskedMoveOp("VMASKMOVPS", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x2C, 0x2E); + public static final VexMaskedMoveOp VMASKMOVPD = new VexMaskedMoveOp("VMASKMOVPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x2D, 0x2F); + public static final VexMaskedMoveOp VPMASKMOVD = new VexMaskedMoveOp("VPMASKMOVD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, 0x8C, 0x8E, VEXOpAssertion.AVX2); + public static final VexMaskedMoveOp VPMASKMOVQ = new VexMaskedMoveOp("VPMASKMOVQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W1, 0x8C, 0x8E, VEXOpAssertion.AVX2); // @formatter:on private final int opReverse; @@ -2155,14 +2135,14 @@ private VexMaskedMoveOp(String opcode, int pp, int mmmmm, int w, int op, int opR this.opReverse = opReverse; } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register mask, AMD64Address src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register mask, AMD64Address src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, mask, null), "emitting invalid instruction"); asm.vexPrefix(dst, mask, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); asm.emitOperandHelper(dst, src, 0); } - public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register mask, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register mask, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, mask, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(src, mask, dst, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(opReverse); @@ -2175,10 +2155,10 @@ public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register ma */ public static final class VexMoveMaskOp extends VexGeneralMoveOp { // @formatter:off - public static final VexMoveMaskOp KMOVW = new VexMoveMaskOp("KMOVW", P_, P_, M_0F, W0, W0, VEXOpAssertion.AVX512F_CPU_OR_MASK); - public static final VexMoveMaskOp KMOVB = new VexMoveMaskOp("KMOVB", P_66, P_66, M_0F, W0, W0, VEXOpAssertion.AVX512DQ_CPU_OR_MASK); - public static final VexMoveMaskOp KMOVQ = new VexMoveMaskOp("KMOVQ", P_, P_F2, M_0F, W1, W1, VEXOpAssertion.AVX512BW_CPU_OR_MASK); - public static final VexMoveMaskOp KMOVD = new VexMoveMaskOp("KMOVD", P_66, P_F2, M_0F, W1, W0, VEXOpAssertion.AVX512BW_CPU_OR_MASK); + public static final VexMoveMaskOp KMOVW = new VexMoveMaskOp("KMOVW", VEXPrefixConfig.P_, VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, VEXPrefixConfig.W0, VEXOpAssertion.AVX512F_CPU_OR_MASK); + public static final VexMoveMaskOp KMOVB = new VexMoveMaskOp("KMOVB", VEXPrefixConfig.P_66, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, VEXPrefixConfig.W0, VEXOpAssertion.AVX512DQ_CPU_OR_MASK); + public static final VexMoveMaskOp KMOVQ = new VexMoveMaskOp("KMOVQ", VEXPrefixConfig.P_, VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, VEXPrefixConfig.W1, VEXOpAssertion.AVX512BW_CPU_OR_MASK); + public static final VexMoveMaskOp KMOVD = new VexMoveMaskOp("KMOVD", VEXPrefixConfig.P_66, VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, VEXPrefixConfig.W0, VEXOpAssertion.AVX512BW_CPU_OR_MASK); // @formatter:on /* @@ -2205,7 +2185,7 @@ private VexMoveMaskOp(String opcode, int pp, int ppCPU, int mmmmm, int w, int wC } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, src), "emitting invalid instruction"); GraalError.guarantee(!(inRC(CPU, dst) && inRC(CPU, src)), "source and destination can't both be CPU registers"); int actualOp = op(dst, src); @@ -2217,7 +2197,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src) { } @Override - public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, AMD64Address dst, Register src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, src, null, null), "emitting invalid instruction"); GraalError.guarantee(inRC(MASK, src), "source must be a mask register"); asm.vexPrefix(src, Register.None, dst, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); @@ -2226,7 +2206,7 @@ public void emit(AMD64Assembler asm, AVXSize size, AMD64Address dst, Register sr } @Override - public void emit(AMD64Assembler asm, AVXSize size, Register dst, AMD64Address src) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, AMD64Address src) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, null, null), "emitting invalid instruction"); GraalError.guarantee(inRC(MASK, dst), "destination must be a mask register"); asm.vexPrefix(dst, Register.None, src, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); @@ -2270,52 +2250,52 @@ private int w(Register dst, Register src) { */ public static final class VexRVMIOp extends VexOp { // @formatter:off - public static final VexRVMIOp VPINSRB = new VexRVMIOp("VPINSRB", P_66, M_0F3A, W0, 0x20, VEXOpAssertion.XMM_XMM_CPU); - public static final VexRVMIOp VPINSRW = new VexRVMIOp("VPINSRW", P_66, M_0F, W0, 0xC4, VEXOpAssertion.XMM_XMM_CPU); - public static final VexRVMIOp VPINSRD = new VexRVMIOp("VPINSRD", P_66, M_0F3A, W0, 0x22, VEXOpAssertion.XMM_XMM_CPU); - public static final VexRVMIOp VPINSRQ = new VexRVMIOp("VPINSRQ", P_66, M_0F3A, W1, 0x22, VEXOpAssertion.XMM_XMM_CPU); + public static final VexRVMIOp VPINSRB = new VexRVMIOp("VPINSRB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x20, VEXOpAssertion.XMM_XMM_CPU); + public static final VexRVMIOp VPINSRW = new VexRVMIOp("VPINSRW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0xC4, VEXOpAssertion.XMM_XMM_CPU); + public static final VexRVMIOp VPINSRD = new VexRVMIOp("VPINSRD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x22, VEXOpAssertion.XMM_XMM_CPU); + public static final VexRVMIOp VPINSRQ = new VexRVMIOp("VPINSRQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x22, VEXOpAssertion.XMM_XMM_CPU); - public static final VexRVMIOp VSHUFPS = new VexRVMIOp("VSHUFPS", P_, M_0F, WIG, 0xC6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMIOp VSHUFPD = new VexRVMIOp("VSHUFPD", P_66, M_0F, WIG, 0xC6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexRVMIOp VPTERNLOGD = new VexRVMIOp("VPTERNLOGD", P_66, M_0F3A, W0, 0x25, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMIOp VPTERNLOGQ = new VexRVMIOp("VPTERNLOGQ", P_66, M_0F3A, W1, 0x25, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); + public static final VexRVMIOp VSHUFPS = new VexRVMIOp("VSHUFPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xC6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMIOp VSHUFPD = new VexRVMIOp("VSHUFPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xC6, VEXOpAssertion.AVX1_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMIOp VPTERNLOGD = new VexRVMIOp("VPTERNLOGD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x25, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMIOp VPTERNLOGQ = new VexRVMIOp("VPTERNLOGQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x25, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); // AVX/AVX2 insert - public static final VexRVMIOp VINSERTF128 = new VexRVMIOp("VINSERTF128", P_66, M_0F3A, W0, 0x18, VEXOpAssertion.AVX1_256ONLY); - public static final VexRVMIOp VINSERTI128 = new VexRVMIOp("VINSERTI128", P_66, M_0F3A, W0, 0x38, VEXOpAssertion.AVX2_256ONLY); + public static final VexRVMIOp VINSERTF128 = new VexRVMIOp("VINSERTF128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x18, VEXOpAssertion.AVX1_256ONLY); + public static final VexRVMIOp VINSERTI128 = new VexRVMIOp("VINSERTI128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x38, VEXOpAssertion.AVX2_256ONLY); // AVX2 128-bit permutation - public static final VexRVMIOp VPERM2I128 = new VexRVMIOp("VPERM2I128", P_66, M_0F3A, W0, 0x46, VEXOpAssertion.AVX2_256ONLY); - public static final VexRVMIOp VPERM2F128 = new VexRVMIOp("VPERM2F128", P_66, M_0F3A, W0, 0x06, VEXOpAssertion.AVX1_256ONLY); + public static final VexRVMIOp VPERM2I128 = new VexRVMIOp("VPERM2I128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x46, VEXOpAssertion.AVX2_256ONLY); + public static final VexRVMIOp VPERM2F128 = new VexRVMIOp("VPERM2F128", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x06, VEXOpAssertion.AVX1_256ONLY); // Carry-Less Multiplication Quadword - public static final VexRVMIOp VPCLMULQDQ = new VexRVMIOp("VPCLMULQDQ", P_66, M_0F3A, WIG, 0x44, VEXOpAssertion.AVX1_128ONLY_CLMUL); + public static final VexRVMIOp VPCLMULQDQ = new VexRVMIOp("VPCLMULQDQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.WIG, 0x44, VEXOpAssertion.AVX1_128ONLY_CLMUL); // Packed Align Right - public static final VexRVMIOp VPALIGNR = new VexRVMIOp("VPALIGNR", P_66, M_0F3A, WIG, 0x0F, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, WIG); + public static final VexRVMIOp VPALIGNR = new VexRVMIOp("VPALIGNR", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.WIG, 0x0F, VEXOpAssertion.AVX1_AVX2_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.WIG); // Blend Packed Dwords - public static final VexRVMIOp VPBLENDD = new VexRVMIOp("VPBLENDD", P_66, M_0F3A, W0, 0x02, VEXOpAssertion.AVX2); + public static final VexRVMIOp VPBLENDD = new VexRVMIOp("VPBLENDD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x02, VEXOpAssertion.AVX2); // AVX-512 insert - public static final VexRVMIOp VINSERTF32X4 = new VexRVMIOp("VINSERTF32X4", P_66, M_0F3A, W0, 0x18, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, W0); - public static final VexRVMIOp VINSERTI32X4 = new VexRVMIOp("VINSERTI32X4", P_66, M_0F3A, W0, 0x38, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, W0); - public static final VexRVMIOp VINSERTF64X2 = new VexRVMIOp("VINSERTF64X2", P_66, M_0F3A, W1, 0x18, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, W1); - public static final VexRVMIOp VINSERTI64X2 = new VexRVMIOp("VINSERTI64X2", P_66, M_0F3A, W1, 0x38, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, W1); + public static final VexRVMIOp VINSERTF32X4 = new VexRVMIOp("VINSERTF32X4", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x18, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, VEXPrefixConfig.W0); + public static final VexRVMIOp VINSERTI32X4 = new VexRVMIOp("VINSERTI32X4", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x38, VEXOpAssertion.AVX512F_VL_256_512, EVEXTuple.T4_32BIT, VEXPrefixConfig.W0); + public static final VexRVMIOp VINSERTF64X2 = new VexRVMIOp("VINSERTF64X2", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x18, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, VEXPrefixConfig.W1); + public static final VexRVMIOp VINSERTI64X2 = new VexRVMIOp("VINSERTI64X2", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x38, VEXOpAssertion.AVX512DQ_VL_256_512, EVEXTuple.T2_64BIT, VEXPrefixConfig.W1); - public static final VexRVMIOp VINSERTF32X8 = new VexRVMIOp("VINSERTF32X8", P_66, M_0F3A, W0, 0x1A, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, W0); - public static final VexRVMIOp VINSERTI32X8 = new VexRVMIOp("VINSERTI32X8", P_66, M_0F3A, W0, 0x3A, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, W0); - public static final VexRVMIOp VINSERTF64X4 = new VexRVMIOp("VINSERTF64X4", P_66, M_0F3A, W1, 0x1A, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, W1); - public static final VexRVMIOp VINSERTI64X4 = new VexRVMIOp("VINSERTI64X4", P_66, M_0F3A, W1, 0x3A, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, W1); + public static final VexRVMIOp VINSERTF32X8 = new VexRVMIOp("VINSERTF32X8", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x1A, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, VEXPrefixConfig.W0); + public static final VexRVMIOp VINSERTI32X8 = new VexRVMIOp("VINSERTI32X8", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x3A, VEXOpAssertion.AVX512DQ_512ONLY, EVEXTuple.T8_32BIT, VEXPrefixConfig.W0); + public static final VexRVMIOp VINSERTF64X4 = new VexRVMIOp("VINSERTF64X4", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x1A, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, VEXPrefixConfig.W1); + public static final VexRVMIOp VINSERTI64X4 = new VexRVMIOp("VINSERTI64X4", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x3A, VEXOpAssertion.AVX512F_512ONLY, EVEXTuple.T4_64BIT, VEXPrefixConfig.W1); - public static final VexRVMIOp VALIGND = new VexRVMIOp("VALIGND", P_66, M_0F3A, W0, 0x03, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMIOp VALIGNQ = new VexRVMIOp("VALIGNQ", P_66, M_0F3A, W1, 0x03, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, W1); + public static final VexRVMIOp VALIGND = new VexRVMIOp("VALIGND", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x03, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMIOp VALIGNQ = new VexRVMIOp("VALIGNQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x03, VEXOpAssertion.AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); // AVX-512 unsigned comparisons - public static final VexRVMIOp VPCMPUB = new VexRVMIOp("VPCMPUB", P_66, M_0F3A, W0, 0x3E, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, W0); - public static final VexRVMIOp VPCMPUW = new VexRVMIOp("VPCMPUW", P_66, M_0F3A, W1, 0x3E, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, W1); - public static final VexRVMIOp VPCMPUD = new VexRVMIOp("VPCMPUD", P_66, M_0F3A, W0, 0x1E, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexRVMIOp VPCMPUQ = new VexRVMIOp("VPCMPUQ", P_66, M_0F3A, W1, 0x1E, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W1); + public static final VexRVMIOp VPCMPUB = new VexRVMIOp("VPCMPUB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x3E, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMIOp VPCMPUW = new VexRVMIOp("VPCMPUW", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x3E, VEXOpAssertion.MASK_XMM_XMM_AVX512BW_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexRVMIOp VPCMPUD = new VexRVMIOp("VPCMPUD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, 0x1E, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexRVMIOp VPCMPUQ = new VexRVMIOp("VPCMPUQ", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0x1E, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); // Galois Field New Instructions - public static final VexRVMIOp VGF2P8AFFINEQB = new VexRVMIOp("VGF2P8AFFINEQB", P_66, M_0F3A, W1, 0xCE, VEXOpAssertion.AVX1_GFNI_AVX512F_VL, EVEXTuple.FVM, W1); + public static final VexRVMIOp VGF2P8AFFINEQB = new VexRVMIOp("VGF2P8AFFINEQB", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, 0xCE, VEXOpAssertion.AVX1_GFNI_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); // @formatter:on private VexRVMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertion assertion) { @@ -2326,7 +2306,7 @@ private VexRVMIOp(String opcode, int pp, int mmmmm, int w, int op, VEXOpAssertio super(opcode, pp, mmmmm, w, op, assertion, evexTuple, wEvex); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, src2), "emitting invalid instruction"); assert (imm8 & 0xFF) == imm8; asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); @@ -2335,7 +2315,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, asm.emitByte(imm8); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, int imm8) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2, int imm8) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, null), "emitting invalid instruction"); assert (imm8 & 0xFF) == imm8; boolean useEvex = asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); @@ -2351,14 +2331,14 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, */ public static final class VexFloatCompareOp extends VexOp { // @formatter:off - public static final VexFloatCompareOp VCMPPS = new VexFloatCompareOp("VCMPPS", P_, M_0F, WIG, 0xC2); - public static final VexFloatCompareOp VCMPPS_AVX512 = new VexFloatCompareOp("VCMPPS", P_, M_0F, W0, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W0); - public static final VexFloatCompareOp VCMPPD = new VexFloatCompareOp("VCMPPD", P_66, M_0F, WIG, 0xC2); - public static final VexFloatCompareOp VCMPPD_AVX512 = new VexFloatCompareOp("VCMPPD", P_66, M_0F, W1, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, W1); - public static final VexFloatCompareOp VCMPSS = new VexFloatCompareOp("VCMPSS", P_F3, M_0F, WIG, 0xC2); - public static final VexFloatCompareOp VCMPSS_AVX512 = new VexFloatCompareOp("VCMPSS", P_F3, M_0F, W0, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.T1S_32BIT, W0); - public static final VexFloatCompareOp VCMPSD = new VexFloatCompareOp("VCMPSD", P_F2, M_0F, WIG, 0xC2); - public static final VexFloatCompareOp VCMPSD_AVX512 = new VexFloatCompareOp("VCMPSD", P_F2, M_0F, W1, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.T1S_64BIT, W1); + public static final VexFloatCompareOp VCMPPS = new VexFloatCompareOp("VCMPPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xC2); + public static final VexFloatCompareOp VCMPPS_AVX512 = new VexFloatCompareOp("VCMPPS", VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W0); + public static final VexFloatCompareOp VCMPPD = new VexFloatCompareOp("VCMPPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xC2); + public static final VexFloatCompareOp VCMPPD_AVX512 = new VexFloatCompareOp("VCMPPD", VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.FVM, VEXPrefixConfig.W1); + public static final VexFloatCompareOp VCMPSS = new VexFloatCompareOp("VCMPSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xC2); + public static final VexFloatCompareOp VCMPSS_AVX512 = new VexFloatCompareOp("VCMPSS", VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.T1S_32BIT, VEXPrefixConfig.W0); + public static final VexFloatCompareOp VCMPSD = new VexFloatCompareOp("VCMPSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, 0xC2); + public static final VexFloatCompareOp VCMPSD_AVX512 = new VexFloatCompareOp("VCMPSD", VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, 0xC2, VEXOpAssertion.MASK_XMM_XMM_AVX512F_VL, EVEXTuple.T1S_64BIT, VEXPrefixConfig.W1); // @formatter:on public enum Predicate { @@ -2448,7 +2428,7 @@ private VexFloatCompareOp(String opcode, int pp, int mmmmm, int w, int op, VEXOp super(opcode, pp, mmmmm, w, op, assertion, evexTuple, wEvex); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, Register src2, Predicate p) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, Register src2, Predicate p) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, src2), "emitting invalid instruction"); asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -2456,7 +2436,7 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, asm.emitByte(p.imm8); } - public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, AMD64Address src2, Predicate p) { + public void emit(AMD64Assembler asm, AVXKind.AVXSize size, Register dst, Register src1, AMD64Address src2, Predicate p) { GraalError.guarantee(assertion.check(asm.getFeatures(), size, dst, src1, null), "emitting invalid instruction"); boolean useEvex = asm.vexPrefix(dst, src1, src2, size, pp, mmmmm, w, wEvex, false, assertion.l128feature, assertion.l256feature); asm.emitByte(op); @@ -2465,64 +2445,64 @@ public void emit(AMD64Assembler asm, AVXSize size, Register dst, Register src1, } } - public final void emit(VexRMOp op, Register dst, Register src, AVXSize size) { + public final void emit(VexRMOp op, Register dst, Register src, AVXKind.AVXSize size) { op.emit(this, size, dst, src); } - public final void emit(VexRMOp op, Register dst, AMD64Address src, AVXSize size) { + public final void emit(VexRMOp op, Register dst, AMD64Address src, AVXKind.AVXSize size) { op.emit(this, size, dst, src); } - public final void emit(VexRMIOp op, Register dst, Register src, int imm8, AVXSize size) { + public final void emit(VexRMIOp op, Register dst, Register src, int imm8, AVXKind.AVXSize size) { op.emit(this, size, dst, src, imm8); } - public final void emit(VexMRIOp op, Register dst, Register src, int imm8, AVXSize size) { + public final void emit(VexMRIOp op, Register dst, Register src, int imm8, AVXKind.AVXSize size) { op.emit(this, size, dst, src, imm8); } - public final void emit(VexRVMOp op, Register dst, Register src1, Register src2, AVXSize size) { + public final void emit(VexRVMOp op, Register dst, Register src1, Register src2, AVXKind.AVXSize size) { op.emit(this, size, dst, src1, src2); } - public final void emit(VexGeneralPurposeRMVOp op, Register dst, Register src1, Register src2, AVXSize size) { + public final void emit(VexGeneralPurposeRMVOp op, Register dst, Register src1, Register src2, AVXKind.AVXSize size) { op.emit(this, size, dst, src1, src2); } public final void addl(AMD64Address dst, int imm32) { - ADD.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + ADD.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void addl(Register dst, int imm32) { - ADD.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + ADD.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void addl(Register dst, Register src) { - ADD.rmOp.emit(this, DWORD, dst, src); + ADD.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void addl(Register dst, AMD64Address src) { - ADD.rmOp.emit(this, DWORD, dst, src); + ADD.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void adcl(Register dst, int imm32) { - ADC.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + ADC.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void addpd(Register dst, Register src) { - SSEOp.ADD.emit(this, PD, dst, src); + SSEOp.ADD.emit(this, OperandSize.PD, dst, src); } public final void addpd(Register dst, AMD64Address src) { - SSEOp.ADD.emit(this, PD, dst, src); + SSEOp.ADD.emit(this, OperandSize.PD, dst, src); } public final void addsd(Register dst, Register src) { - SSEOp.ADD.emit(this, SD, dst, src); + SSEOp.ADD.emit(this, OperandSize.SD, dst, src); } public final void addsd(Register dst, AMD64Address src) { - SSEOp.ADD.emit(this, SD, dst, src); + SSEOp.ADD.emit(this, OperandSize.SD, dst, src); } private void addrNop4() { @@ -2560,23 +2540,23 @@ private void addrNop8() { } public final void andl(Register dst, int imm32) { - AND.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + AND.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void andl(Register dst, Register src) { - AND.rmOp.emit(this, DWORD, dst, src); + AND.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void mull(Register src) { - MUL.emit(this, DWORD, src); + MUL.emit(this, OperandSize.DWORD, src); } public final void andpd(Register dst, Register src) { - SSEOp.AND.emit(this, PD, dst, src); + SSEOp.AND.emit(this, OperandSize.PD, dst, src); } public final void andpd(Register dst, AMD64Address src) { - SSEOp.AND.emit(this, PD, dst, src); + SSEOp.AND.emit(this, OperandSize.PD, dst, src); } public final void bsfq(Register dst, Register src) { @@ -2594,7 +2574,7 @@ public final void bsrl(Register dst, Register src) { } public final void popcntl(Register dst, Register src) { - AMD64RMOp.POPCNT.emit(this, DWORD, dst, src); + AMD64RMOp.POPCNT.emit(this, OperandSize.DWORD, dst, src); } public final void bswapl(Register reg) { @@ -2622,27 +2602,27 @@ public final void cmovl(ConditionFlag cc, Register dst, AMD64Address src) { } public final void cmpb(Register dst, Register src) { - CMP.byteRmOp.emit(this, BYTE, dst, src); + CMP.byteRmOp.emit(this, OperandSize.BYTE, dst, src); } public final void cmpw(Register dst, Register src) { - CMP.rmOp.emit(this, WORD, dst, src); + CMP.rmOp.emit(this, OperandSize.WORD, dst, src); } public final void cmpl(Register dst, int imm32) { - CMP.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + CMP.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void cmpl(Register dst, Register src) { - CMP.rmOp.emit(this, DWORD, dst, src); + CMP.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void cmpl(Register dst, AMD64Address src) { - CMP.rmOp.emit(this, DWORD, dst, src); + CMP.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void cmpl(AMD64Address dst, int imm32) { - CMP.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + CMP.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } /** @@ -2683,19 +2663,19 @@ public final void cmpxchgl(Register reg, AMD64Address adr) { // cmpxchg } public final void cvtsi2sdl(Register dst, Register src) { - SSEOp.CVTSI2SD.emit(this, DWORD, dst, src); + SSEOp.CVTSI2SD.emit(this, OperandSize.DWORD, dst, src); } public final void cvttsd2sil(Register dst, Register src) { - SSEOp.CVTTSD2SI.emit(this, DWORD, dst, src); + SSEOp.CVTTSD2SI.emit(this, OperandSize.DWORD, dst, src); } public final void decl(AMD64Address dst) { - DEC.emit(this, DWORD, dst); + DEC.emit(this, OperandSize.DWORD, dst); } public final void divsd(Register dst, Register src) { - SSEOp.DIV.emit(this, SD, dst, src); + SSEOp.DIV.emit(this, OperandSize.SD, dst, src); } public final void hlt() { @@ -2704,14 +2684,14 @@ public final void hlt() { public final void imull(Register dst, Register src, int value) { if (isByte(value)) { - AMD64RMIOp.IMUL_SX.emit(this, DWORD, dst, src, value); + AMD64RMIOp.IMUL_SX.emit(this, OperandSize.DWORD, dst, src, value); } else { - AMD64RMIOp.IMUL.emit(this, DWORD, dst, src, value); + AMD64RMIOp.IMUL.emit(this, OperandSize.DWORD, dst, src, value); } } public final void incl(AMD64Address dst) { - INC.emit(this, DWORD, dst); + INC.emit(this, OperandSize.DWORD, dst); } public static final int JCC_ERRATUM_MITIGATION_BOUNDARY = 0x20; @@ -2720,34 +2700,34 @@ public final void incl(AMD64Address dst) { protected static int getPrefixInBytes(OperandSize size, Register dst, boolean dstIsByte) { boolean needsRex = needsRex(dst, dstIsByte); - if (size == WORD) { + if (size == OperandSize.WORD) { return needsRex ? 2 : 1; } - return size == QWORD || needsRex ? 1 : 0; + return size == OperandSize.QWORD || needsRex ? 1 : 0; } protected static int getPrefixInBytes(OperandSize size, AMD64Address src) { boolean needsRex = needsRex(src.getBase()) || needsRex(src.getIndex()); - if (size == WORD) { + if (size == OperandSize.WORD) { return needsRex ? 2 : 1; } - return size == QWORD || needsRex ? 1 : 0; + return size == OperandSize.QWORD || needsRex ? 1 : 0; } protected static int getPrefixInBytes(OperandSize size, Register dst, boolean dstIsByte, Register src, boolean srcIsByte) { boolean needsRex = needsRex(dst, dstIsByte) || needsRex(src, srcIsByte); - if (size == WORD) { + if (size == OperandSize.WORD) { return needsRex ? 2 : 1; } - return size == QWORD || needsRex ? 1 : 0; + return size == OperandSize.QWORD || needsRex ? 1 : 0; } protected static int getPrefixInBytes(OperandSize size, Register dst, boolean dstIsByte, AMD64Address src) { boolean needsRex = needsRex(dst, dstIsByte) || needsRex(src.getBase()) || needsRex(src.getIndex()); - if (size == WORD) { + if (size == OperandSize.WORD) { return needsRex ? 2 : 1; } - return size == QWORD || needsRex ? 1 : 0; + return size == OperandSize.QWORD || needsRex ? 1 : 0; } protected boolean mayCrossBoundary(int opStart, int opEnd) { @@ -2959,7 +2939,7 @@ public final void jmp(Register entry) { } public final void jmp(AMD64Address adr) { - int bytesToEmit = getPrefixInBytes(DWORD, adr) + OPCODE_IN_BYTES + addressInBytes(adr); + int bytesToEmit = getPrefixInBytes(OperandSize.DWORD, adr) + OPCODE_IN_BYTES + addressInBytes(adr); mitigateJCCErratum(bytesToEmit); int beforeJmp = position(); prefix(adr); @@ -3054,14 +3034,14 @@ public final void lock() { public final void movapd(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F, false); emitByte(0x28); emitModRM(dst, src); } public final void movaps(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PS, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PS, P_0F, false); emitByte(0x28); emitModRM(dst, src); } @@ -3144,14 +3124,14 @@ public final void movl(AMD64Address dst, Register src) { */ public final void movlpd(Register dst, AMD64Address src) { assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x12); emitOperandHelper(dst, src, 0); } public final void movlhps(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PS, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PS, P_0F, false); emitByte(0x16); emitModRM(dst, src); } @@ -3167,7 +3147,7 @@ public final void movq(Register dst, AMD64Address src, boolean force4BytesDispla // An alternative instruction would be 66 REX.W 0F 6E /r. We prefer the REX.W free // format, because it would allow us to emit 2-bytes-prefixed vex-encoding instruction // when applicable. - simdPrefix(dst, Register.None, src, SS, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.SS, P_0F, false); emitByte(0x7E); emitOperandHelper(dst, src, force4BytesDisplacement, 0); } else { @@ -3192,7 +3172,7 @@ public final void movq(AMD64Address dst, Register src) { // An alternative instruction would be 66 REX.W 0F 7E /r. We prefer the REX.W free // format, because it would allow us to emit 2-bytes-prefixed vex-encoding instruction // when applicable. - simdPrefix(src, Register.None, dst, PD, P_0F, false); + simdPrefix(src, Register.None, dst, OperandSize.PD, P_0F, false); emitByte(0xD6); emitOperandHelper(src, dst, 0); } else { @@ -3232,59 +3212,59 @@ public final void movsbq(Register dst, Register src) { } public final void movsd(Register dst, Register src) { - SSEOp.MOVSD.emit(this, SD, dst, src); + SSEOp.MOVSD.emit(this, OperandSize.SD, dst, src); } public final void movsd(Register dst, AMD64Address src) { - SSEOp.MOVSD.emit(this, SD, dst, src); + SSEOp.MOVSD.emit(this, OperandSize.SD, dst, src); } public final void movsd(AMD64Address dst, Register src) { - SSEMROp.MOVSD.emit(this, SD, dst, src); + SSEMROp.MOVSD.emit(this, OperandSize.SD, dst, src); } public final void movss(Register dst, Register src) { - SSEOp.MOVSS.emit(this, SS, dst, src); + SSEOp.MOVSS.emit(this, OperandSize.SS, dst, src); } public final void movss(Register dst, AMD64Address src) { - SSEOp.MOVSS.emit(this, SS, dst, src); + SSEOp.MOVSS.emit(this, OperandSize.SS, dst, src); } public final void movss(AMD64Address dst, Register src) { - SSEMROp.MOVSS.emit(this, SS, dst, src); + SSEMROp.MOVSS.emit(this, OperandSize.SS, dst, src); } public final void mulpd(Register dst, Register src) { - SSEOp.MUL.emit(this, PD, dst, src); + SSEOp.MUL.emit(this, OperandSize.PD, dst, src); } public final void mulpd(Register dst, AMD64Address src) { - SSEOp.MUL.emit(this, PD, dst, src); + SSEOp.MUL.emit(this, OperandSize.PD, dst, src); } public final void mulsd(Register dst, Register src) { - SSEOp.MUL.emit(this, SD, dst, src); + SSEOp.MUL.emit(this, OperandSize.SD, dst, src); } public final void mulsd(Register dst, AMD64Address src) { - SSEOp.MUL.emit(this, SD, dst, src); + SSEOp.MUL.emit(this, OperandSize.SD, dst, src); } public final void mulss(Register dst, Register src) { - SSEOp.MUL.emit(this, SS, dst, src); + SSEOp.MUL.emit(this, OperandSize.SS, dst, src); } public final void movswl(Register dst, Register src) { - AMD64RMOp.MOVSX.emit(this, DWORD, dst, src); + AMD64RMOp.MOVSX.emit(this, OperandSize.DWORD, dst, src); } public final void movswl(Register dst, AMD64Address src) { - AMD64RMOp.MOVSX.emit(this, DWORD, dst, src); + AMD64RMOp.MOVSX.emit(this, OperandSize.DWORD, dst, src); } public final void movswq(Register dst, AMD64Address src) { - AMD64RMOp.MOVSX.emit(this, QWORD, dst, src); + AMD64RMOp.MOVSX.emit(this, OperandSize.QWORD, dst, src); } public final void movw(AMD64Address dst, int imm16) { @@ -3317,35 +3297,35 @@ public final void movzbl(Register dst, AMD64Address src) { } public final void movzbl(Register dst, Register src) { - AMD64RMOp.MOVZXB.emit(this, DWORD, dst, src); + AMD64RMOp.MOVZXB.emit(this, OperandSize.DWORD, dst, src); } public final void movzbq(Register dst, Register src) { - AMD64RMOp.MOVZXB.emit(this, QWORD, dst, src); + AMD64RMOp.MOVZXB.emit(this, OperandSize.QWORD, dst, src); } public final void movzbq(Register dst, AMD64Address src) { - AMD64RMOp.MOVZXB.emit(this, QWORD, dst, src); + AMD64RMOp.MOVZXB.emit(this, OperandSize.QWORD, dst, src); } public final void movzwl(Register dst, AMD64Address src) { - AMD64RMOp.MOVZX.emit(this, DWORD, dst, src); + AMD64RMOp.MOVZX.emit(this, OperandSize.DWORD, dst, src); } public final void movzwq(Register dst, AMD64Address src) { - AMD64RMOp.MOVZX.emit(this, QWORD, dst, src); + AMD64RMOp.MOVZX.emit(this, OperandSize.QWORD, dst, src); } public final void negl(Register dst) { - NEG.emit(this, DWORD, dst); + NEG.emit(this, OperandSize.DWORD, dst); } public final void notl(Register dst) { - NOT.emit(this, DWORD, dst); + NOT.emit(this, OperandSize.DWORD, dst); } public final void notq(Register dst) { - NOT.emit(this, QWORD, dst); + NOT.emit(this, OperandSize.QWORD, dst); } @Override @@ -3454,27 +3434,27 @@ private void intelNops(int count) { } public final void orl(Register dst, Register src) { - OR.rmOp.emit(this, DWORD, dst, src); + OR.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void orl(Register dst, AMD64Address src) { - OR.rmOp.emit(this, DWORD, dst, src); + OR.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void orl(AMD64Address dst, Register src) { - OR.mrOp.emit(this, DWORD, dst, src); + OR.mrOp.emit(this, OperandSize.DWORD, dst, src); } public final void orl(Register dst, int imm32) { - OR.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + OR.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void packuswb(Register dst, Register src) { - SSEOp.PACKUSWB.emit(this, PD, dst, src); + SSEOp.PACKUSWB.emit(this, OperandSize.PD, dst, src); } public final void packusdw(Register dst, Register src) { - SSEOp.PACKUSDW.emit(this, PD, dst, src); + SSEOp.PACKUSDW.emit(this, OperandSize.PD, dst, src); } public final void pop(Register dst) { @@ -3489,7 +3469,7 @@ public void popfq() { public final void ptest(Register dst, Register src) { GraalError.guarantee(supports(CPUFeature.SSE4_1), "PTEST requires SSE4.1"); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F38, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F38, false); emitByte(0x17); emitModRM(dst, src); } @@ -3497,7 +3477,7 @@ public final void ptest(Register dst, Register src) { public final void ptest(Register dst, AMD64Address src) { GraalError.guarantee(supports(CPUFeature.SSE4_1), "PTEST requires SSE4.1"); assert inRC(XMM, dst); - simdPrefix(dst, Register.None, src, PD, P_0F38, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F38, false); emitByte(0x17); emitOperandHelper(dst, src, 0); } @@ -3505,7 +3485,7 @@ public final void ptest(Register dst, AMD64Address src) { public final void pcmpeqb(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x74); emitModRM(dst, src); } @@ -3513,7 +3493,7 @@ public final void pcmpeqb(Register dst, Register src) { public final void pcmpeqb(Register dst, AMD64Address src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x74); emitOperandHelper(dst, src, 0); } @@ -3521,7 +3501,7 @@ public final void pcmpeqb(Register dst, AMD64Address src) { public final void pcmpeqw(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x75); emitModRM(dst, src); } @@ -3529,7 +3509,7 @@ public final void pcmpeqw(Register dst, Register src) { public final void pcmpeqw(Register dst, AMD64Address src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x75); emitOperandHelper(dst, src, 0); } @@ -3537,7 +3517,7 @@ public final void pcmpeqw(Register dst, AMD64Address src) { public final void pcmpeqd(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x76); emitModRM(dst, src); } @@ -3545,27 +3525,27 @@ public final void pcmpeqd(Register dst, Register src) { public final void pcmpeqd(Register dst, AMD64Address src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x76); emitOperandHelper(dst, src, 0); } public final void pminub(Register dst, Register src) { - SSEOp.PMINUB.emit(this, PD, dst, src); + SSEOp.PMINUB.emit(this, OperandSize.PD, dst, src); } public final void pminuw(Register dst, Register src) { - SSEOp.PMINUW.emit(this, PD, dst, src); + SSEOp.PMINUW.emit(this, OperandSize.PD, dst, src); } public final void pminud(Register dst, Register src) { - SSEOp.PMINUD.emit(this, PD, dst, src); + SSEOp.PMINUD.emit(this, OperandSize.PD, dst, src); } public final void pcmpgtb(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x64); emitModRM(dst, src); } @@ -3573,7 +3553,7 @@ public final void pcmpgtb(Register dst, Register src) { public final void pcmpgtd(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x66); emitModRM(dst, src); } @@ -3581,7 +3561,7 @@ public final void pcmpgtd(Register dst, Register src) { public final void pcmpestri(Register dst, AMD64Address src, int imm8) { assert supports(CPUFeature.SSE4_2); assert inRC(XMM, dst); - simdPrefix(dst, Register.None, src, PD, P_0F3A, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F3A, false); emitByte(0x61); emitOperandHelper(dst, src, 0); emitByte(imm8); @@ -3590,7 +3570,7 @@ public final void pcmpestri(Register dst, AMD64Address src, int imm8) { public final void pcmpestri(Register dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F3A, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F3A, false); emitByte(0x61); emitModRM(dst, src); emitByte(imm8); @@ -3599,7 +3579,7 @@ public final void pcmpestri(Register dst, Register src, int imm8) { public final void pmovmskb(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(CPU, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F, false); emitByte(0xD7); emitModRM(dst, src); } @@ -3607,7 +3587,7 @@ public final void pmovmskb(Register dst, Register src) { private void pmovSZx(Register dst, AMD64Address src, int op) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, dst); - simdPrefix(dst, Register.None, src, PD, P_0F38, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F38, false); emitByte(op); emitOperandHelper(dst, src, 0); } @@ -3615,7 +3595,7 @@ private void pmovSZx(Register dst, AMD64Address src, int op) { private void pmovSZx(Register dst, Register src, int op) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F38, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F38, false); emitByte(op); emitModRM(dst, src); } @@ -3721,9 +3701,9 @@ public final void gf2p8affineqb(Register dst, Register src, int imm8) { assert inRC(XMM, dst) && inRC(XMM, src); if (supports(CPUFeature.AVX)) { - VGF2P8AFFINEQB.emit(this, AVXSize.XMM, dst, dst, src, imm8); + VGF2P8AFFINEQB.emit(this, AVXKind.AVXSize.XMM, dst, dst, src, imm8); } else { - simdPrefix(dst, dst, src, PD, P_0F3A, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, false); emitByte(0xCE); emitModRM(dst, src); emitByte(imm8); @@ -3734,14 +3714,14 @@ public final void vcvtps2ph(Register dst, Register src, int imm8) { GraalError.guarantee(supports(F16C), "vcvtps2ph requires F16C"); assert inRC(XMM, dst) && inRC(XMM, src); - VCVTPS2PH.emit(this, AVXSize.XMM, dst, src, imm8); + VCVTPS2PH.emit(this, AVXKind.AVXSize.XMM, dst, src, imm8); } public final void vcvtph2ps(Register dst, Register src) { GraalError.guarantee(supports(F16C), "vcvtph2ps requires F16C"); assert inRC(XMM, dst) && inRC(XMM, src); - VCVTPH2PS.emit(this, AVXSize.XMM, dst, src); + VCVTPH2PS.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void push(Register src) { @@ -3761,21 +3741,21 @@ public void pushfq() { public final void paddd(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xFE); emitModRM(dst, src); } public final void paddd(Register dst, AMD64Address src) { assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xFE); emitOperandHelper(dst, src, 0); } public final void paddq(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xD4); emitModRM(dst, src); } @@ -3783,7 +3763,7 @@ public final void paddq(Register dst, Register src) { public final void pextrb(AMD64Address dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, src); - simdPrefix(src, Register.None, dst, PD, P_0F3A, false); + simdPrefix(src, Register.None, dst, OperandSize.PD, P_0F3A, false); emitByte(0x14); emitOperandHelper(src, dst, 0); emitByte(imm8); @@ -3791,7 +3771,7 @@ public final void pextrb(AMD64Address dst, Register src, int imm8) { public final void pextrw(Register dst, Register src, int imm8) { assert inRC(CPU, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F, false); emitByte(0xC5); emitModRM(dst, src); emitByte(imm8); @@ -3800,7 +3780,7 @@ public final void pextrw(Register dst, Register src, int imm8) { public final void pextrw(AMD64Address dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, src); - simdPrefix(src, Register.None, dst, PD, P_0F3A, false); + simdPrefix(src, Register.None, dst, OperandSize.PD, P_0F3A, false); emitByte(0x15); emitOperandHelper(src, dst, 0); emitByte(imm8); @@ -3809,7 +3789,7 @@ public final void pextrw(AMD64Address dst, Register src, int imm8) { public final void pextrd(AMD64Address dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, src); - simdPrefix(src, Register.None, dst, PD, P_0F3A, false); + simdPrefix(src, Register.None, dst, OperandSize.PD, P_0F3A, false); emitByte(0x16); emitOperandHelper(src, dst, 0); emitByte(imm8); @@ -3818,7 +3798,7 @@ public final void pextrd(AMD64Address dst, Register src, int imm8) { public final void pextrq(Register dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(CPU, dst) && inRC(XMM, src); - simdPrefix(src, Register.None, dst, PD, P_0F3A, true); + simdPrefix(src, Register.None, dst, OperandSize.PD, P_0F3A, true); emitByte(0x16); emitModRM(src, dst); emitByte(imm8); @@ -3827,7 +3807,7 @@ public final void pextrq(Register dst, Register src, int imm8) { public final void pextrq(AMD64Address dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, src); - simdPrefix(src, Register.None, dst, PD, P_0F3A, true); + simdPrefix(src, Register.None, dst, OperandSize.PD, P_0F3A, true); emitByte(0x16); emitOperandHelper(src, dst, 0); emitByte(imm8); @@ -3836,7 +3816,7 @@ public final void pextrq(AMD64Address dst, Register src, int imm8) { public final void pinsrb(Register dst, AMD64Address src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F3A, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, false); emitByte(0x20); emitOperandHelper(dst, src, 0); emitByte(imm8); @@ -3845,7 +3825,7 @@ public final void pinsrb(Register dst, AMD64Address src, int imm8) { public final void pinsrw(Register dst, Register src, int imm8) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(CPU, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xC4); emitModRM(dst, src); emitByte(imm8); @@ -3853,7 +3833,7 @@ public final void pinsrw(Register dst, Register src, int imm8) { public final void pinsrw(Register dst, AMD64Address src, int imm8) { assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xC4); emitOperandHelper(dst, src, 0); emitByte(imm8); @@ -3862,7 +3842,7 @@ public final void pinsrw(Register dst, AMD64Address src, int imm8) { public final void pinsrd(Register dst, AMD64Address src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F3A, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, false); emitByte(0x22); emitOperandHelper(dst, src, 0); emitByte(imm8); @@ -3871,7 +3851,7 @@ public final void pinsrd(Register dst, AMD64Address src, int imm8) { public final void pinsrq(Register dst, Register src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, dst) && inRC(CPU, src); - simdPrefix(dst, dst, src, PD, P_0F3A, true); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, true); emitByte(0x22); emitModRM(dst, src); emitByte(imm8); @@ -3880,7 +3860,7 @@ public final void pinsrq(Register dst, Register src, int imm8) { public final void pinsrq(Register dst, AMD64Address src, int imm8) { assert supports(CPUFeature.SSE4_1); assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F3A, true); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, true); emitByte(0x22); emitOperandHelper(dst, src, 0); emitByte(imm8); @@ -3888,14 +3868,14 @@ public final void pinsrq(Register dst, AMD64Address src, int imm8) { public final void por(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xEB); emitModRM(dst, src); } public final void palignr(Register dst, Register src, int imm8) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F3A, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, false); emitByte(0x0F); emitModRM(dst, src); emitByte(imm8); @@ -3903,7 +3883,7 @@ public final void palignr(Register dst, Register src, int imm8) { public final void pblendw(Register dst, Register src, int imm8) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F3A, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, false); emitByte(0x0E); emitModRM(dst, src); emitByte(imm8); @@ -3911,28 +3891,28 @@ public final void pblendw(Register dst, Register src, int imm8) { public final void pand(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xDB); emitModRM(dst, src); } public final void pand(Register dst, AMD64Address src) { assert inRC(XMM, dst); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xDB); emitOperandHelper(dst, src, 0); } public final void pandn(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xDF); emitModRM(dst, src); } public final void pxor(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xEF); emitModRM(dst, src); } @@ -3941,7 +3921,7 @@ public final void psllw(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM6 is for /6 encoding: 66 0F 71 /6 ib - simdPrefix(AMD64.xmm6, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm6, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x71); emitModRM(6, dst); emitByte(imm8 & 0xFF); @@ -3951,7 +3931,7 @@ public final void pslld(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM6 is for /6 encoding: 66 0F 72 /6 ib - simdPrefix(AMD64.xmm6, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm6, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x72); emitModRM(6, dst); emitByte(imm8 & 0xFF); @@ -3961,7 +3941,7 @@ public final void pslldq(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM7 is for /7 encoding: 66 0F 73 /7 ib - simdPrefix(AMD64.xmm7, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm7, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x73); emitModRM(7, dst); emitByte(imm8 & 0xFF); @@ -3969,7 +3949,7 @@ public final void pslldq(Register dst, int imm8) { public final void psllq(Register dst, Register shift) { assert inRC(XMM, dst) && inRC(XMM, shift); - simdPrefix(dst, dst, shift, PD, P_0F, false); + simdPrefix(dst, dst, shift, OperandSize.PD, P_0F, false); emitByte(0xF3); emitModRM(dst, shift); } @@ -3978,7 +3958,7 @@ public final void psllq(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM6 is for /6 encoding: 66 0F 73 /6 ib - simdPrefix(AMD64.xmm6, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm6, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x73); emitModRM(6, dst); emitByte(imm8); @@ -3988,7 +3968,7 @@ public final void psrad(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM4 is for /4 encoding: 66 0F 72 /4 ib - simdPrefix(AMD64.xmm4, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm4, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x72); emitModRM(4, dst); emitByte(imm8); @@ -3998,7 +3978,7 @@ public final void psrlw(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM2 is for /2 encoding: 66 0F 72 /2 ib - simdPrefix(AMD64.xmm2, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm2, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x71); emitModRM(2, dst); emitByte(imm8); @@ -4008,7 +3988,7 @@ public final void psrld(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM2 is for /2 encoding: 66 0F 72 /2 ib - simdPrefix(AMD64.xmm2, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm2, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x72); emitModRM(2, dst); emitByte(imm8); @@ -4018,7 +3998,7 @@ public final void psrlq(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); // XMM2 is for /2 encoding: 66 0F 73 /2 ib - simdPrefix(AMD64.xmm2, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm2, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x73); emitModRM(2, dst); emitByte(imm8); @@ -4027,25 +4007,25 @@ public final void psrlq(Register dst, int imm8) { public final void psrldq(Register dst, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst); - simdPrefix(AMD64.xmm3, dst, dst, PD, P_0F, false); + simdPrefix(AMD64.xmm3, dst, dst, OperandSize.PD, P_0F, false); emitByte(0x73); emitModRM(3, dst); emitByte(imm8); } public final void pshufb(Register dst, Register src) { - SSEOp.PSHUFB.emit(this, PD, dst, src); + SSEOp.PSHUFB.emit(this, OperandSize.PD, dst, src); } public final void pshufb(Register dst, AMD64Address src) { - SSEOp.PSHUFB.emit(this, PD, dst, src); + SSEOp.PSHUFB.emit(this, OperandSize.PD, dst, src); } public final void pshuflw(Register dst, Register src, int imm8) { GraalError.guarantee(supports(CPUFeature.SSE2), "pshuflw requires SSE2"); assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, SD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.SD, P_0F, false); emitByte(0x70); emitModRM(dst, src); emitByte(imm8); @@ -4054,31 +4034,31 @@ public final void pshuflw(Register dst, Register src, int imm8) { public final void pshufd(Register dst, Register src, int imm8) { assert isUByte(imm8) : "invalid value"; assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F, false); emitByte(0x70); emitModRM(dst, src); emitByte(imm8); } public final void psubusb(Register dst, Register src) { - SSEOp.PSUBUSB.emit(this, PD, dst, src); + SSEOp.PSUBUSB.emit(this, OperandSize.PD, dst, src); } public final void psubusb(Register dst, AMD64Address src) { - SSEOp.PSUBUSB.emit(this, PD, dst, src); + SSEOp.PSUBUSB.emit(this, OperandSize.PD, dst, src); } public final void psubusw(Register dst, Register src) { - SSEOp.PSUBUSW.emit(this, PD, dst, src); + SSEOp.PSUBUSW.emit(this, OperandSize.PD, dst, src); } public final void psubusw(Register dst, AMD64Address src) { - SSEOp.PSUBUSW.emit(this, PD, dst, src); + SSEOp.PSUBUSW.emit(this, OperandSize.PD, dst, src); } public final void psubd(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0xFA); emitModRM(dst, src); } @@ -4086,7 +4066,7 @@ public final void psubd(Register dst, Register src) { public final void punpcklbw(Register dst, Register src) { assert supports(CPUFeature.SSE2); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x60); emitModRM(dst, src); } @@ -4094,55 +4074,55 @@ public final void punpcklbw(Register dst, Register src) { public final void pclmulqdq(Register dst, Register src, int imm8) { assert supports(CPUFeature.CLMUL); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F3A, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F3A, false); emitByte(0x44); emitModRM(dst, src); emitByte(imm8); } - public final void vpshufb(Register dst, Register src1, Register src2, AVXSize size) { + public final void vpshufb(Register dst, Register src1, Register src2, AVXKind.AVXSize size) { VexRVMOp.VPSHUFB.emit(this, size, dst, src1, src2); } - public final void vpshufd(Register dst, Register src, int imm8, AVXSize size) { + public final void vpshufd(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexRMIOp.VPSHUFD.emit(this, size, dst, src, imm8); } public final void vpclmulqdq(Register dst, Register nds, Register src, int imm8) { - VexRVMIOp.VPCLMULQDQ.emit(this, AVXSize.XMM, dst, nds, src, imm8); + VexRVMIOp.VPCLMULQDQ.emit(this, AVXKind.AVXSize.XMM, dst, nds, src, imm8); } - public final void vpblendd(Register dst, Register nds, Register src, int imm8, AVXSize size) { + public final void vpblendd(Register dst, Register nds, Register src, int imm8, AVXKind.AVXSize size) { VexRVMIOp.VPBLENDD.emit(this, size, dst, nds, src, imm8); } public final void vpclmullqlqdq(Register dst, Register nds, Register src) { - VexRVMIOp.VPCLMULQDQ.emit(this, AVXSize.XMM, dst, nds, src, 0x00); + VexRVMIOp.VPCLMULQDQ.emit(this, AVXKind.AVXSize.XMM, dst, nds, src, 0x00); } public final void vpclmulhqlqdq(Register dst, Register nds, Register src) { - VexRVMIOp.VPCLMULQDQ.emit(this, AVXSize.XMM, dst, nds, src, 0x01); + VexRVMIOp.VPCLMULQDQ.emit(this, AVXKind.AVXSize.XMM, dst, nds, src, 0x01); } public final void vpclmullqhqdq(Register dst, Register nds, Register src) { - VexRVMIOp.VPCLMULQDQ.emit(this, AVXSize.XMM, dst, nds, src, 0x10); + VexRVMIOp.VPCLMULQDQ.emit(this, AVXKind.AVXSize.XMM, dst, nds, src, 0x10); } public final void vpclmulhqhqdq(Register dst, Register nds, Register src) { - VexRVMIOp.VPCLMULQDQ.emit(this, AVXSize.XMM, dst, nds, src, 0x11); + VexRVMIOp.VPCLMULQDQ.emit(this, AVXKind.AVXSize.XMM, dst, nds, src, 0x11); } - public final void vpsrlq(Register dst, Register src, int imm8, AVXSize size) { + public final void vpsrlq(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexShiftOp.VPSRLQ.emit(this, size, dst, src, imm8); } - public final void vpsllq(Register dst, Register src, int imm8, AVXSize size) { + public final void vpsllq(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexShiftOp.VPSLLQ.emit(this, size, dst, src, imm8); } public final void rcpps(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PS, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PS, P_0F, false); emitByte(0x53); emitModRM(dst, src); } @@ -4201,7 +4181,7 @@ public final void shll(Register dst) { // Insn: SHLX r32a, r/m32, r32b public final void shlxl(Register dst, Register src1, Register src2) { - VexGeneralPurposeRMVOp.SHLX.emit(this, AVXSize.DWORD, dst, src1, src2); + VexGeneralPurposeRMVOp.SHLX.emit(this, AVXKind.AVXSize.DWORD, dst, src1, src2); } public final void shrl(Register dst, int imm8) { @@ -4220,27 +4200,27 @@ public final void shrl(Register dst) { } public final void subl(AMD64Address dst, int imm32) { - SUB.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + SUB.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void subl(Register dst, int imm32) { - SUB.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + SUB.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void subl(Register dst, Register src) { - SUB.rmOp.emit(this, DWORD, dst, src); + SUB.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void subpd(Register dst, Register src) { - SSEOp.SUB.emit(this, PD, dst, src); + SSEOp.SUB.emit(this, OperandSize.PD, dst, src); } public final void subsd(Register dst, Register src) { - SSEOp.SUB.emit(this, SD, dst, src); + SSEOp.SUB.emit(this, OperandSize.SD, dst, src); } public final void subsd(Register dst, AMD64Address src) { - SSEOp.SUB.emit(this, SD, dst, src); + SSEOp.SUB.emit(this, OperandSize.SD, dst, src); } public final void testl(Register dst, int imm32) { @@ -4251,50 +4231,50 @@ public final void testl(Register dst, int imm32) { emitByte(0xA9); emitInt(imm32); } else { - AMD64MIOp.TEST.emit(this, DWORD, dst, imm32); + AMD64MIOp.TEST.emit(this, OperandSize.DWORD, dst, imm32); } } public final void testl(Register dst, Register src) { - AMD64RMOp.TEST.emit(this, DWORD, dst, src); + AMD64RMOp.TEST.emit(this, OperandSize.DWORD, dst, src); } public final void testl(Register dst, AMD64Address src) { - AMD64RMOp.TEST.emit(this, DWORD, dst, src); + AMD64RMOp.TEST.emit(this, OperandSize.DWORD, dst, src); } public final void unpckhpd(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x15); emitModRM(dst, src); } public final void unpcklpd(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F, false); emitByte(0x14); emitModRM(dst, src); } public final void xorb(Register dst, AMD64Address src) { - XOR.byteRmOp.emit(this, BYTE, dst, src); + XOR.byteRmOp.emit(this, OperandSize.BYTE, dst, src); } public final void xorl(Register dst, Register src) { - XOR.rmOp.emit(this, DWORD, dst, src); + XOR.rmOp.emit(this, OperandSize.DWORD, dst, src); } public final void xorl(Register dst, int imm32) { - XOR.getMIOpcode(DWORD, isByte(imm32)).emit(this, DWORD, dst, imm32); + XOR.getMIOpcode(OperandSize.DWORD, isByte(imm32)).emit(this, OperandSize.DWORD, dst, imm32); } public final void xorq(Register dst, Register src) { - XOR.rmOp.emit(this, QWORD, dst, src); + XOR.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void xorpd(Register dst, Register src) { - SSEOp.XOR.emit(this, PD, dst, src); + SSEOp.XOR.emit(this, OperandSize.PD, dst, src); } /** @@ -4302,11 +4282,11 @@ public final void xorpd(Register dst, Register src) { * E.g., constants stored into the data section should be aligned to 16 bytes. */ public final void xorpd(Register dst, AMD64Address src) { - SSEOp.XOR.emit(this, PD, dst, src); + SSEOp.XOR.emit(this, OperandSize.PD, dst, src); } public final void xorps(Register dst, Register src) { - SSEOp.XOR.emit(this, PS, dst, src); + SSEOp.XOR.emit(this, OperandSize.PS, dst, src); } /** @@ -4314,109 +4294,109 @@ public final void xorps(Register dst, Register src) { * E.g., constants stored into the data section should be aligned to 16 bytes. */ public final void xorps(Register dst, AMD64Address src) { - SSEOp.XOR.emit(this, PS, dst, src); + SSEOp.XOR.emit(this, OperandSize.PS, dst, src); } public final void ucomiss(Register dst, Register src) { - SSEOp.UCOMIS.emit(this, PS, dst, src); + SSEOp.UCOMIS.emit(this, OperandSize.PS, dst, src); } public final void ucomisd(Register dst, Register src) { - SSEOp.UCOMIS.emit(this, PD, dst, src); + SSEOp.UCOMIS.emit(this, OperandSize.PD, dst, src); } public final void decl(Register dst) { // Use two-byte form (one-byte form is a REX prefix in 64-bit mode) - DEC.emit(this, DWORD, dst); + DEC.emit(this, OperandSize.DWORD, dst); } public final void incl(Register dst) { // Use two-byte form (one-byte from is a REX prefix in 64-bit mode) - INC.emit(this, DWORD, dst); + INC.emit(this, OperandSize.DWORD, dst); } public final void imull(Register dst, Register src) { - IMUL.emit(this, DWORD, dst, src); + IMUL.emit(this, OperandSize.DWORD, dst, src); } public final void addq(Register dst, int imm32) { - ADD.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + ADD.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void addq(AMD64Address dst, int imm32) { - ADD.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + ADD.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void addq(Register dst, Register src) { - ADD.rmOp.emit(this, QWORD, dst, src); + ADD.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void addq(Register dst, AMD64Address src) { - ADD.rmOp.emit(this, QWORD, dst, src); + ADD.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void addq(AMD64Address dst, Register src) { - ADD.mrOp.emit(this, QWORD, dst, src); + ADD.mrOp.emit(this, OperandSize.QWORD, dst, src); } public final void adcq(Register dst, int imm32) { - ADC.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + ADC.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void adcxq(Register dst, Register src) { - ADCX.emit(this, QWORD, dst, src); + ADCX.emit(this, OperandSize.QWORD, dst, src); } public final void adoxq(Register dst, Register src) { - ADOX.emit(this, QWORD, dst, src); + ADOX.emit(this, OperandSize.QWORD, dst, src); } public final void andq(Register dst, int imm32) { - AND.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + AND.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void andq(Register dst, AMD64Address src) { - AND.getRMOpcode(QWORD).emit(this, QWORD, dst, src); + AND.getRMOpcode(OperandSize.QWORD).emit(this, OperandSize.QWORD, dst, src); } public final void andq(Register dst, Register src) { - AND.getRMOpcode(QWORD).emit(this, QWORD, dst, src); + AND.getRMOpcode(OperandSize.QWORD).emit(this, OperandSize.QWORD, dst, src); } public final void mulq(Register src) { - MUL.emit(this, QWORD, src); + MUL.emit(this, OperandSize.QWORD, src); } public final void mulxq(Register dst1, Register dst2, Register src) { - MULX.emit(this, AVXSize.QWORD, dst1, dst2, src); + MULX.emit(this, AVXKind.AVXSize.QWORD, dst1, dst2, src); } public final void roll(Register dst, int imm8) { GraalError.guarantee(isByte(imm8), "only byte immediate is supported"); - ROL.miOp.emit(this, DWORD, dst, (byte) imm8); + ROL.miOp.emit(this, OperandSize.DWORD, dst, (byte) imm8); } public final void rorq(Register dst, int imm8) { GraalError.guarantee(isByte(imm8), "only byte immediate is supported"); - ROR.miOp.emit(this, QWORD, dst, (byte) imm8); + ROR.miOp.emit(this, OperandSize.QWORD, dst, (byte) imm8); } public final void rorxl(Register dst, Register src, int imm8) { - RORXL.emit(this, AVXSize.QWORD, dst, src, (byte) imm8); + RORXL.emit(this, AVXKind.AVXSize.QWORD, dst, src, (byte) imm8); } public final void rorxq(Register dst, Register src, int imm8) { - RORXQ.emit(this, AVXSize.QWORD, dst, src, (byte) imm8); + RORXQ.emit(this, AVXKind.AVXSize.QWORD, dst, src, (byte) imm8); } public final void rclq(Register dst, int imm8) { GraalError.guarantee(isByte(imm8), "only byte immediate is supported"); - RCL.miOp.emit(this, QWORD, dst, (byte) imm8); + RCL.miOp.emit(this, OperandSize.QWORD, dst, (byte) imm8); } public final void rcrq(Register dst, int imm8) { GraalError.guarantee(isByte(imm8), "only byte immediate is supported"); - RCR.miOp.emit(this, QWORD, dst, (byte) imm8); + RCR.miOp.emit(this, OperandSize.QWORD, dst, (byte) imm8); } public final void bsrq(Register dst, Register src) { @@ -4471,15 +4451,15 @@ public final void cmovq(ConditionFlag cc, Register dst, AMD64Address src) { } public final void cmpq(Register dst, int imm32) { - CMP.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + CMP.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void cmpq(Register dst, Register src) { - CMP.rmOp.emit(this, QWORD, dst, src); + CMP.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void cmpq(Register dst, AMD64Address src) { - CMP.rmOp.emit(this, QWORD, dst, src); + CMP.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void cmpxchgq(Register reg, AMD64Address adr) { @@ -4491,51 +4471,51 @@ public final void cmpxchgq(Register reg, AMD64Address adr) { public final void cvtdq2pd(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, SS, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.SS, P_0F, false); emitByte(0xE6); emitModRM(dst, src); } public final void cvtsi2sdq(Register dst, Register src) { - SSEOp.CVTSI2SD.emit(this, QWORD, dst, src); + SSEOp.CVTSI2SD.emit(this, OperandSize.QWORD, dst, src); } public final void cvttss2sil(Register dst, Register src) { - SSEOp.CVTTSS2SI.emit(this, DWORD, dst, src); + SSEOp.CVTTSS2SI.emit(this, OperandSize.DWORD, dst, src); } public final void cvttsd2siq(Register dst, Register src) { - SSEOp.CVTTSD2SI.emit(this, QWORD, dst, src); + SSEOp.CVTTSD2SI.emit(this, OperandSize.QWORD, dst, src); } public final void cvttpd2dq(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F, false); emitByte(0xE6); emitModRM(dst, src); } public final void decq(Register dst) { // Use two-byte form (one-byte form is a REX prefix in 64-bit mode) - DEC.emit(this, QWORD, dst); + DEC.emit(this, OperandSize.QWORD, dst); } public final void decq(AMD64Address dst) { - DEC.emit(this, QWORD, dst); + DEC.emit(this, OperandSize.QWORD, dst); } public final void imulq(Register dst, Register src) { - IMUL.emit(this, QWORD, dst, src); + IMUL.emit(this, OperandSize.QWORD, dst, src); } public final void incq(Register dst) { // Don't use it directly. Use Macroincrementq() instead. // Use two-byte form (one-byte from is a REX prefix in 64-bit mode) - INC.emit(this, QWORD, dst); + INC.emit(this, OperandSize.QWORD, dst); } public final void incq(AMD64Address dst) { - INC.emit(this, QWORD, dst); + INC.emit(this, OperandSize.QWORD, dst); } public final void movq(Register dst, long imm64) { @@ -4562,18 +4542,18 @@ public final void movslq(Register dst, int imm32) { } public final void movdq(Register dst, AMD64Address src) { - SSEOp.MOVQ.emit(this, QWORD, dst, src); + SSEOp.MOVQ.emit(this, OperandSize.QWORD, dst, src); } public final void movdq(AMD64Address dst, Register src) { - SSEMROp.MOVQ.emit(this, QWORD, dst, src); + SSEMROp.MOVQ.emit(this, OperandSize.QWORD, dst, src); } public final void movdq(Register dst, Register src) { if (inRC(XMM, dst) && inRC(CPU, src)) { - SSEOp.MOVQ.emit(this, QWORD, dst, src); + SSEOp.MOVQ.emit(this, OperandSize.QWORD, dst, src); } else if (inRC(XMM, src) && inRC(CPU, dst)) { - SSEMROp.MOVQ.emit(this, QWORD, dst, src); + SSEMROp.MOVQ.emit(this, OperandSize.QWORD, dst, src); } else { throw new InternalError("should not reach here"); } @@ -4581,36 +4561,36 @@ public final void movdq(Register dst, Register src) { public final void movdl(Register dst, Register src) { if (inRC(XMM, dst) && inRC(CPU, src)) { - SSEOp.MOVD.emit(this, DWORD, dst, src); + SSEOp.MOVD.emit(this, OperandSize.DWORD, dst, src); } else if (inRC(XMM, src) && inRC(CPU, dst)) { - SSEMROp.MOVD.emit(this, DWORD, dst, src); + SSEMROp.MOVD.emit(this, OperandSize.DWORD, dst, src); } else { throw new InternalError("should not reach here"); } } public final void movdl(Register dst, AMD64Address src) { - SSEOp.MOVD.emit(this, DWORD, dst, src); + SSEOp.MOVD.emit(this, OperandSize.DWORD, dst, src); } public final void movddup(Register dst, Register src) { assert supports(CPUFeature.SSE3); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, SD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.SD, P_0F, false); emitByte(0x12); emitModRM(dst, src); } public final void movdqu(Register dst, AMD64Address src) { assert inRC(XMM, dst); - simdPrefix(dst, Register.None, src, SS, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.SS, P_0F, false); emitByte(0x6F); emitOperandHelper(dst, src, 0); } public final void movdqu(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, SS, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.SS, P_0F, false); emitByte(0x6F); emitModRM(dst, src); } @@ -4620,14 +4600,14 @@ public final void movdqu(Register dst, Register src) { public final void movdqu(AMD64Address dst, Register src) { assert inRC(XMM, src); // Code: VEX.128.F3.0F.WIG 7F /r - simdPrefix(src, Register.None, dst, SS, P_0F, false); + simdPrefix(src, Register.None, dst, OperandSize.SS, P_0F, false); emitByte(0x7F); emitOperandHelper(src, dst, 0); } public final void movdqa(Register dst, Register src) { assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, Register.None, src, PD, P_0F, false); + simdPrefix(dst, Register.None, src, OperandSize.PD, P_0F, false); emitByte(0x6F); emitModRM(dst, src); } @@ -4658,15 +4638,15 @@ public final void negq(Register dst) { } public final void orq(Register dst, Register src) { - OR.rmOp.emit(this, QWORD, dst, src); + OR.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void orq(Register dst, AMD64Address src) { - OR.rmOp.emit(this, QWORD, dst, src); + OR.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void orq(Register dst, int imm32) { - OR.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + OR.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void shlq(Register dst, int imm8) { @@ -4730,36 +4710,36 @@ public final void sarq(Register dst) { } public final void sbbq(Register dst, Register src) { - SBB.rmOp.emit(this, QWORD, dst, src); + SBB.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void subq(Register dst, int imm32) { - SUB.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + SUB.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void subq(AMD64Address dst, int imm32) { - SUB.getMIOpcode(QWORD, isByte(imm32)).emit(this, QWORD, dst, imm32); + SUB.getMIOpcode(OperandSize.QWORD, isByte(imm32)).emit(this, OperandSize.QWORD, dst, imm32); } public final void subqWide(Register dst, int imm32) { // don't use the sign-extending version, forcing a 32-bit immediate - SUB.getMIOpcode(QWORD, false).emit(this, QWORD, dst, imm32); + SUB.getMIOpcode(OperandSize.QWORD, false).emit(this, OperandSize.QWORD, dst, imm32); } public final void subq(Register dst, Register src) { - SUB.rmOp.emit(this, QWORD, dst, src); + SUB.rmOp.emit(this, OperandSize.QWORD, dst, src); } public final void sqrtsd(Register dst, Register src) { - SSEOp.SQRT.emit(this, SD, dst, src); + SSEOp.SQRT.emit(this, OperandSize.SD, dst, src); } public final void testq(Register dst, Register src) { - AMD64RMOp.TEST.emit(this, QWORD, dst, src); + AMD64RMOp.TEST.emit(this, OperandSize.QWORD, dst, src); } public final void testq(Register dst, AMD64Address src) { - AMD64RMOp.TEST.emit(this, QWORD, dst, src); + AMD64RMOp.TEST.emit(this, OperandSize.QWORD, dst, src); } public final void btrq(Register src, int imm8) { @@ -4825,31 +4805,31 @@ public final void xchgq(Register dst, AMD64Address src) { } public final void sha1msg1(Register dst, Register src) { - SHA1MSG1.emit(this, PS, dst, src); + SHA1MSG1.emit(this, OperandSize.PS, dst, src); } public final void sha1msg2(Register dst, Register src) { - SHA1MSG2.emit(this, PS, dst, src); + SHA1MSG2.emit(this, OperandSize.PS, dst, src); } public final void sha1nexte(Register dst, Register src) { - SHA1NEXTE.emit(this, PS, dst, src); + SHA1NEXTE.emit(this, OperandSize.PS, dst, src); } public final void sha1rnds4(Register dst, Register src, int imm8) { - SHA1RNDS4.emit(this, PS, dst, src, imm8); + SHA1RNDS4.emit(this, OperandSize.PS, dst, src, imm8); } public final void sha256msg1(Register dst, Register src) { - SHA256MSG1.emit(this, PS, dst, src); + SHA256MSG1.emit(this, OperandSize.PS, dst, src); } public final void sha256msg2(Register dst, Register src) { - SHA256MSG2.emit(this, PS, dst, src); + SHA256MSG2.emit(this, OperandSize.PS, dst, src); } public final void sha256rnds2(Register dst, Register src) { - SHA256RNDS2.emit(this, PS, dst, src); + SHA256RNDS2.emit(this, OperandSize.PS, dst, src); } public final void membar(int barriers) { @@ -5173,134 +5153,134 @@ public void clflush(AMD64Address adr) { emitOperandHelper(7, adr, 0); } - public final void vpaddd(Register dst, Register nds, Register src, AVXSize size) { + public final void vpaddd(Register dst, Register nds, Register src, AVXKind.AVXSize size) { VexRVMOp.VPADDD.emit(this, size, dst, nds, src); } - public final void vpaddd(Register dst, Register nds, AMD64Address src, AVXSize size) { + public final void vpaddd(Register dst, Register nds, AMD64Address src, AVXKind.AVXSize size) { VexRVMOp.VPADDD.emit(this, size, dst, nds, src); } - public final void vpaddq(Register dst, Register nds, Register src, AVXSize size) { + public final void vpaddq(Register dst, Register nds, Register src, AVXKind.AVXSize size) { VexRVMOp.VPADDQ.emit(this, size, dst, nds, src); } - public final void vpaddq(Register dst, Register nds, AMD64Address src, AVXSize size) { + public final void vpaddq(Register dst, Register nds, AMD64Address src, AVXKind.AVXSize size) { VexRVMOp.VPADDQ.emit(this, size, dst, nds, src); } - public final void vpand(Register dst, Register nds, Register src, AVXSize size) { + public final void vpand(Register dst, Register nds, Register src, AVXKind.AVXSize size) { VexRVMOp.VPAND.emit(this, size, dst, nds, src); } public final void vpandn(Register dst, Register nds, Register src) { - VexRVMOp.VPANDN.emit(this, AVXSize.YMM, dst, nds, src); + VexRVMOp.VPANDN.emit(this, AVXKind.AVXSize.YMM, dst, nds, src); } - public final void vpor(Register dst, Register nds, Register src, AVXSize size) { + public final void vpor(Register dst, Register nds, Register src, AVXKind.AVXSize size) { VexRVMOp.VPOR.emit(this, size, dst, nds, src); } - public final void vptest(Register dst, Register src, AVXSize size) { + public final void vptest(Register dst, Register src, AVXKind.AVXSize size) { VexRMOp.VPTEST.emit(this, size, dst, src); } - public final void vpxor(Register dst, Register nds, Register src, AVXSize size) { + public final void vpxor(Register dst, Register nds, Register src, AVXKind.AVXSize size) { VexRVMOp.VPXOR.emit(this, size, dst, nds, src); } - public final void vpxor(Register dst, Register nds, AMD64Address src, AVXSize size) { + public final void vpxor(Register dst, Register nds, AMD64Address src, AVXKind.AVXSize size) { VexRVMOp.VPXOR.emit(this, size, dst, nds, src); } public final void vpsllw(Register dst, Register src, int imm8) { - VexShiftOp.VPSLLW.emit(this, AVXSize.YMM, dst, src, imm8); + VexShiftOp.VPSLLW.emit(this, AVXKind.AVXSize.YMM, dst, src, imm8); } public final void vpsrlw(Register dst, Register src, int imm8) { - VexShiftOp.VPSRLW.emit(this, AVXSize.YMM, dst, src, imm8); + VexShiftOp.VPSRLW.emit(this, AVXKind.AVXSize.YMM, dst, src, imm8); } - public final void vpslld(Register dst, Register src, int imm8, AVXSize size) { + public final void vpslld(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexShiftOp.VPSLLD.emit(this, size, dst, src, imm8); } - public final void vpslldq(Register dst, Register src, int imm8, AVXSize size) { + public final void vpslldq(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexShiftImmOp.VPSLLDQ.emit(this, size, dst, src, imm8); } - public final void vpsrld(Register dst, Register src, int imm8, AVXSize size) { + public final void vpsrld(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexShiftOp.VPSRLD.emit(this, size, dst, src, imm8); } - public final void vpsrldq(Register dst, Register src, int imm8, AVXSize size) { + public final void vpsrldq(Register dst, Register src, int imm8, AVXKind.AVXSize size) { VexShiftImmOp.VPSRLDQ.emit(this, size, dst, src, imm8); } public final void vpcmpeqb(Register dst, Register src1, Register src2) { - VexRVMOp.VPCMPEQB.emit(this, AVXSize.YMM, dst, src1, src2); + VexRVMOp.VPCMPEQB.emit(this, AVXKind.AVXSize.YMM, dst, src1, src2); } public final void vpcmpeqw(Register dst, Register src1, Register src2) { - VexRVMOp.VPCMPEQW.emit(this, AVXSize.YMM, dst, src1, src2); + VexRVMOp.VPCMPEQW.emit(this, AVXKind.AVXSize.YMM, dst, src1, src2); } public final void vpcmpeqd(Register dst, Register src1, Register src2) { - VexRVMOp.VPCMPEQD.emit(this, AVXSize.YMM, dst, src1, src2); + VexRVMOp.VPCMPEQD.emit(this, AVXKind.AVXSize.YMM, dst, src1, src2); } public final void vpmovmskb(Register dst, Register src) { - VexRMOp.VPMOVMSKB.emit(this, AVXSize.YMM, dst, src); + VexRMOp.VPMOVMSKB.emit(this, AVXKind.AVXSize.YMM, dst, src); } public final void vmovdqu(Register dst, AMD64Address src) { - VexMoveOp.VMOVDQU32.emit(this, AVXSize.YMM, dst, src); + VexMoveOp.VMOVDQU32.emit(this, AVXKind.AVXSize.YMM, dst, src); } public final void vmovdqu(Register dst, Register src) { - VexMoveOp.VMOVDQU32.emit(this, AVXSize.YMM, dst, src); + VexMoveOp.VMOVDQU32.emit(this, AVXKind.AVXSize.YMM, dst, src); } public final void vmovdqu(AMD64Address dst, Register src) { assert inRC(XMM, src); - VexMoveOp.VMOVDQU32.emit(this, AVXSize.YMM, dst, src); + VexMoveOp.VMOVDQU32.emit(this, AVXKind.AVXSize.YMM, dst, src); } public final void vmovdqu64(Register dst, AMD64Address src) { - VexMoveOp.VMOVDQU64.emit(this, AVXSize.ZMM, dst, src); + VexMoveOp.VMOVDQU64.emit(this, AVXKind.AVXSize.ZMM, dst, src); } public final void vmovdqu64(AMD64Address dst, Register src) { assert inRC(XMM, src); - VexMoveOp.VMOVDQU64.emit(this, AVXSize.ZMM, dst, src); + VexMoveOp.VMOVDQU64.emit(this, AVXKind.AVXSize.ZMM, dst, src); } public final void vpmovzxbw(Register dst, AMD64Address src) { assert supports(CPUFeature.AVX2); - VexRMOp.VPMOVZXBW.emit(this, AVXSize.YMM, dst, src); + VexRMOp.VPMOVZXBW.emit(this, AVXKind.AVXSize.YMM, dst, src); } - public final void vpalignr(Register dst, Register nds, Register src, int imm8, AVXSize size) { + public final void vpalignr(Register dst, Register nds, Register src, int imm8, AVXKind.AVXSize size) { VexRVMIOp.VPALIGNR.emit(this, size, dst, nds, src, imm8); } public final void vperm2f128(Register dst, Register nds, Register src, int imm8) { - VexRVMIOp.VPERM2F128.emit(this, AVXSize.YMM, dst, nds, src, imm8); + VexRVMIOp.VPERM2F128.emit(this, AVXKind.AVXSize.YMM, dst, nds, src, imm8); } public final void vperm2i128(Register dst, Register nds, Register src, int imm8) { - VexRVMIOp.VPERM2I128.emit(this, AVXSize.YMM, dst, nds, src, imm8); + VexRVMIOp.VPERM2I128.emit(this, AVXKind.AVXSize.YMM, dst, nds, src, imm8); } public final void vzeroupper() { - emitVEX(L128, P_, M_0F, W0, 0, 0, true); + emitVEX(VEXPrefixConfig.L128, VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.W0, 0, 0, true); emitByte(0x77); } public final void aesenc(Register dst, Register src) { assert supports(CPUFeature.AES); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F38, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F38, false); emitByte(0xDC); emitModRM(dst, src); } @@ -5308,7 +5288,7 @@ public final void aesenc(Register dst, Register src) { public final void aesenclast(Register dst, Register src) { assert supports(CPUFeature.AES); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F38, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F38, false); emitByte(0xDD); emitModRM(dst, src); } @@ -5316,7 +5296,7 @@ public final void aesenclast(Register dst, Register src) { public final void aesdec(Register dst, Register src) { assert supports(CPUFeature.AES); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F38, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F38, false); emitByte(0xDE); emitModRM(dst, src); } @@ -5324,7 +5304,7 @@ public final void aesdec(Register dst, Register src) { public final void aesdeclast(Register dst, Register src) { assert supports(CPUFeature.AES); assert inRC(XMM, dst) && inRC(XMM, src); - simdPrefix(dst, dst, src, PD, P_0F38, false); + simdPrefix(dst, dst, src, OperandSize.PD, P_0F38, false); emitByte(0xDF); emitModRM(dst, src); } @@ -5336,7 +5316,7 @@ public final void kortestd(Register src1, Register src2) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, src1) && inRC(MASK, src2); // Code: VEX.L0.66.0F.W1 98 /r - vexPrefix(src1, Register.None, src2, AVXSize.XMM, P_66, M_0F, W1, W1, true); + vexPrefix(src1, Register.None, src2, AVXKind.AVXSize.XMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, VEXPrefixConfig.W1, true); emitByte(0x98); emitModRM(src1, src2); } @@ -5348,57 +5328,57 @@ public final void kortestq(Register src1, Register src2) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, src1) && inRC(MASK, src2); // Code: VEX.L0.0F.W1 98 /r - vexPrefix(src1, Register.None, src2, AVXSize.XMM, P_, M_0F, W1, W1, true); + vexPrefix(src1, Register.None, src2, AVXKind.AVXSize.XMM, VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, VEXPrefixConfig.W1, true); emitByte(0x98); emitModRM(src1, src2); } public final void kmovb(Register dst, Register src) { - VexMoveMaskOp.KMOVB.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVB.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovb(AMD64Address dst, Register src) { - VexMoveMaskOp.KMOVB.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVB.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovb(Register dst, AMD64Address src) { - VexMoveMaskOp.KMOVB.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVB.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovw(Register dst, Register src) { - VexMoveMaskOp.KMOVW.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVW.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovw(AMD64Address dst, Register src) { - VexMoveMaskOp.KMOVW.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVW.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovw(Register dst, AMD64Address src) { - VexMoveMaskOp.KMOVW.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVW.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovd(Register dst, Register src) { - VexMoveMaskOp.KMOVD.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVD.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovd(AMD64Address dst, Register src) { - VexMoveMaskOp.KMOVD.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVD.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovd(Register dst, AMD64Address src) { - VexMoveMaskOp.KMOVD.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVD.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovq(Register dst, Register src) { - VexMoveMaskOp.KMOVQ.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVQ.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovq(AMD64Address dst, Register src) { - VexMoveMaskOp.KMOVQ.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVQ.emit(this, AVXKind.AVXSize.XMM, dst, src); } public final void kmovq(Register dst, AMD64Address src) { - VexMoveMaskOp.KMOVQ.emit(this, AVXSize.XMM, dst, src); + VexMoveMaskOp.KMOVQ.emit(this, AVXKind.AVXSize.XMM, dst, src); } // Insn: KTESTD k1, k2 @@ -5406,7 +5386,7 @@ public final void ktestd(Register src1, Register src2) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, src1) && inRC(MASK, src2); // Code: VEX.L0.66.0F.W1 99 /r - vexPrefix(src1, Register.None, src2, AVXSize.XMM, P_66, M_0F, W1, W1, true); + vexPrefix(src1, Register.None, src2, AVXKind.AVXSize.XMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, VEXPrefixConfig.W1, true); emitByte(0x99); emitModRM(src1, src2); } @@ -5416,7 +5396,7 @@ public final void ktestq(Register src1, Register src2) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, src1) && inRC(MASK, src2); // Code: VEX.L0.0F.W1 99 /r - vexPrefix(src1, Register.None, src2, AVXSize.XMM, P_, M_0F, W1, W1, true); + vexPrefix(src1, Register.None, src2, AVXKind.AVXSize.XMM, VEXPrefixConfig.P_, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, VEXPrefixConfig.W1, true); emitByte(0x99); emitModRM(src1, src2); } @@ -5424,17 +5404,17 @@ public final void ktestq(Register src1, Register src2) { public final void evmovdqu64(Register dst, AMD64Address src) { assert supports(CPUFeature.AVX512F); assert inRC(XMM, dst); - evexPrefix(dst, Register.None, Register.None, src, AVXSize.ZMM, P_F3, M_0F, W1, Z0, B0); + evexPrefix(dst, Register.None, Register.None, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x6F); - emitOperandHelper(dst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(dst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } public final void evmovdqu64(AMD64Address dst, Register src) { assert supports(CPUFeature.AVX512F); assert inRC(XMM, src); - evexPrefix(src, Register.None, Register.None, dst, AVXSize.ZMM, P_F3, M_0F, W1, Z0, B0); + evexPrefix(src, Register.None, Register.None, dst, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x7F); - emitOperandHelper(src, dst, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(src, dst, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VPMOVZXBW zmm1, m256 @@ -5442,17 +5422,17 @@ public final void evpmovzxbw(Register dst, AMD64Address src) { assert supports(CPUFeature.AVX512BW); assert inRC(XMM, dst); // Code: EVEX.512.66.0F38.WIG 30 /r - evexPrefix(dst, Register.None, Register.None, src, AVXSize.ZMM, P_66, M_0F38, WIG, Z0, B0); + evexPrefix(dst, Register.None, Register.None, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x30); - emitOperandHelper(dst, src, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(dst, src, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } public final void evpcmpeqb(Register kdst, Register nds, AMD64Address src) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, kdst) && inRC(XMM, nds); - evexPrefix(kdst, Register.None, nds, src, AVXSize.ZMM, P_66, M_0F, WIG, Z0, B0); + evexPrefix(kdst, Register.None, nds, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x74); - emitOperandHelper(kdst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(kdst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VMOVDQU16 zmm1 {k1}{z}, zmm2/m512 @@ -5462,9 +5442,9 @@ public final void evmovdqu16(Register dst, AMD64Address src) { assert supports(CPUFeature.AVX512BW); assert inRC(XMM, dst); // Code: EVEX.512.F2.0F.W1 6F /r - evexPrefix(dst, Register.None, Register.None, src, AVXSize.ZMM, P_F2, M_0F, W1, Z0, B0); + evexPrefix(dst, Register.None, Register.None, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x6F); - emitOperandHelper(dst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(dst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VMOVDQU16 zmm1, k1:z, m512 @@ -5472,9 +5452,9 @@ public final void evmovdqu16(Register dst, Register mask, AMD64Address src) { assert supports(CPUFeature.AVX512BW); assert inRC(XMM, dst) && inRC(MASK, mask); // Code: EVEX.512.F2.0F.W1 6F /r - evexPrefix(dst, mask, Register.None, src, AVXSize.ZMM, P_F2, M_0F, W1, Z1, B0); + evexPrefix(dst, mask, Register.None, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, EVEXPrefixConfig.Z1, EVEXPrefixConfig.B0); emitByte(0x6F); - emitOperandHelper(dst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(dst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VMOVDQU16 zmm2/m512 {k1}{z}, zmm1 @@ -5484,9 +5464,9 @@ public final void evmovdqu16(AMD64Address dst, Register src) { assert supports(CPUFeature.AVX512BW); assert inRC(XMM, src); // Code: EVEX.512.F2.0F.W1 7F /r - evexPrefix(src, Register.None, Register.None, dst, AVXSize.ZMM, P_F2, M_0F, W1, Z0, B0); + evexPrefix(src, Register.None, Register.None, dst, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x7F); - emitOperandHelper(src, dst, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(src, dst, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VMOVDQU16 m512, k1, zmm1 @@ -5494,9 +5474,9 @@ public final void evmovdqu16(AMD64Address dst, Register mask, Register src) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, mask) && inRC(XMM, src); // Code: EVEX.512.F2.0F.W1 7F /r - evexPrefix(src, mask, Register.None, dst, AVXSize.ZMM, P_F2, M_0F, W1, Z0, B0); + evexPrefix(src, mask, Register.None, dst, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F2, VEXPrefixConfig.M_0F, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x7F); - emitOperandHelper(src, dst, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(src, dst, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VPBROADCASTW zmm1 {k1}{z}, reg @@ -5506,7 +5486,7 @@ public final void evpbroadcastw(Register dst, Register src) { assert supports(CPUFeature.AVX512BW); assert inRC(XMM, dst) && inRC(CPU, src); // Code: EVEX.512.66.0F38.W0 7B /r - evexPrefix(dst, Register.None, Register.None, src, AVXSize.ZMM, P_66, M_0F38, W0, Z0, B0); + evexPrefix(dst, Register.None, Register.None, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x7B); emitModRM(dst, src); } @@ -5518,7 +5498,7 @@ public final void evpcmpuw(Register kdst, Register nds, Register src, int vcc) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, kdst) && inRC(XMM, nds) && inRC(XMM, src); // Code: EVEX.NDS.512.66.0F3A.W1 3E /r ib - evexPrefix(kdst, Register.None, nds, src, AVXSize.ZMM, P_66, M_0F3A, W1, Z0, B0); + evexPrefix(kdst, Register.None, nds, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x3E); emitModRM(kdst, src); emitByte(vcc); @@ -5532,7 +5512,7 @@ public final void evpcmpuw(Register kdst, Register mask, Register nds, Register assert inRC(MASK, kdst) && inRC(MASK, mask); assert inRC(XMM, nds) && inRC(XMM, src); // Code: EVEX.NDS.512.66.0F3A.W1 3E /r ib - evexPrefix(kdst, mask, nds, src, AVXSize.ZMM, P_66, M_0F3A, W1, Z0, B0); + evexPrefix(kdst, mask, nds, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W1, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x3E); emitModRM(kdst, src); emitByte(vcc); @@ -5546,9 +5526,9 @@ public final void evpcmpgtb(Register kdst, Register nds, AMD64Address src) { assert inRC(MASK, kdst); assert inRC(XMM, nds); // Code: EVEX.NDS.512.66.0F.WIG 64 /r - evexPrefix(kdst, Register.None, nds, src, AVXSize.ZMM, P_66, M_0F, WIG, Z0, B0); + evexPrefix(kdst, Register.None, nds, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x64); - emitOperandHelper(kdst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(kdst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VPCMPQTB k1 {k2}, zmm2, zmm3/m512 @@ -5559,9 +5539,9 @@ public final void evpcmpgtb(Register kdst, Register mask, Register nds, AMD64Add assert inRC(MASK, kdst) && inRC(MASK, mask); assert inRC(XMM, nds); // Code: EVEX.NDS.512.66.0F.WIG 64 /r - evexPrefix(kdst, mask, nds, src, AVXSize.ZMM, P_66, M_0F, WIG, Z0, B0); + evexPrefix(kdst, mask, nds, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F, VEXPrefixConfig.WIG, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x64); - emitOperandHelper(kdst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(kdst, src, 0, EVEXTuple.FVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VPMOVWB ymm1/m256 {k1}{z}, zmm2 @@ -5571,9 +5551,9 @@ public final void evpmovwb(AMD64Address dst, Register src) { assert supports(CPUFeature.AVX512BW); assert inRC(XMM, src); // Code: EVEX.512.F3.0F38.W0 30 /r - evexPrefix(src, Register.None, Register.None, dst, AVXSize.ZMM, P_F3, M_0F38, W0, Z0, B0); + evexPrefix(src, Register.None, Register.None, dst, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x30); - emitOperandHelper(src, dst, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(src, dst, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VPMOVWB m256, k1, zmm2 @@ -5581,9 +5561,9 @@ public final void evpmovwb(AMD64Address dst, Register mask, Register src) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, mask) && inRC(XMM, src); // Code: EVEX.512.F3.0F38.W0 30 /r - evexPrefix(src, mask, Register.None, dst, AVXSize.ZMM, P_F3, M_0F38, W0, Z0, B0); + evexPrefix(src, mask, Register.None, dst, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_F3, VEXPrefixConfig.M_0F38, VEXPrefixConfig.W0, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x30); - emitOperandHelper(src, dst, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(src, dst, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: VPMOVZXBW zmm1 {k1}{z}, ymm2/m256 @@ -5593,9 +5573,9 @@ public final void evpmovzxbw(Register dst, Register mask, AMD64Address src) { assert supports(CPUFeature.AVX512BW); assert inRC(MASK, mask) && inRC(XMM, dst); // Code: EVEX.512.66.0F38.WIG 30 /r - evexPrefix(dst, mask, Register.None, src, AVXSize.ZMM, P_66, M_0F38, WIG, Z0, B0); + evexPrefix(dst, mask, Register.None, src, AVXKind.AVXSize.ZMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F38, VEXPrefixConfig.WIG, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x30); - emitOperandHelper(dst, src, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXSize.ZMM)); + emitOperandHelper(dst, src, 0, EVEXTuple.HVM.getDisp8ScalingFactor(AVXKind.AVXSize.ZMM)); } // Insn: vfpclassss k2 {k1}, xmm2/m32, imm8 @@ -5603,7 +5583,7 @@ public final void vfpclassss(Register dst, Register mask, Register src, int imm8 assert supports(CPUFeature.AVX512DQ); assert inRC(MASK, mask) && inRC(MASK, mask) && inRC(XMM, src); // Code: EVEX.LIG.66.0F3A.W0 67 /r - evexPrefix(dst, mask, Register.None, src, AVXSize.XMM, P_66, M_0F3A, W0, Z0, B0); + evexPrefix(dst, mask, Register.None, src, AVXKind.AVXSize.XMM, VEXPrefixConfig.P_66, VEXPrefixConfig.M_0F3A, VEXPrefixConfig.W0, EVEXPrefixConfig.Z0, EVEXPrefixConfig.B0); emitByte(0x67); emitModRM(dst, src); emitByte(imm8); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java index 40b2cd793000..f2a741239da2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64BaseAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64; +package jdk.compiler.graal.asm.amd64; import static jdk.vm.ci.amd64.AMD64.MASK; import static jdk.vm.ci.amd64.AMD64.XMM; @@ -30,31 +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 org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B0; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.B1; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z0; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig.Z1; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L128; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L256; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.L512; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.LZ; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F38; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.M_0F3A; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_66; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F2; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.P_F3; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W0; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.W1; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.VEXPrefixConfig.WIG; -import static org.graalvm.compiler.core.common.NumUtil.isByte; +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 org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.asm.Assembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.asm.Assembler; +import jdk.compiler.graal.core.common.Stride; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; @@ -1025,7 +1024,7 @@ protected final void emitVEX(int l, int pp, int mmmmm, int w, int rxb, int vvvv, } } - public static int getLFlag(AVXSize size) { + public static int getLFlag(AVXKind.AVXSize size) { switch (size) { case XMM: return L128; @@ -1051,10 +1050,10 @@ public static boolean isVariableLengthAVX512Register(AMD64.CPUFeature l128featur * variable-length ({@link CPUFeature#AVX512VL}) AVX-512 instructions. No {@code opmask} * register is encoded for AVX-512 instructions. * - * @see #vexPrefix(Register, Register, Register, Register, AVXSize, int, int, int, int, boolean, - * CPUFeature, CPUFeature, int, int) + * @see #vexPrefix(Register, Register, Register, Register, AVXKind.AVXSize, int, int, int, int, + * boolean, CPUFeature, CPUFeature, int, int) */ - public final boolean vexPrefix(Register dst, Register nds, Register src, AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX) { + public final boolean vexPrefix(Register dst, Register nds, Register src, AVXKind.AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX) { return vexPrefix(dst, nds, src, size, pp, mmmmm, w, wEvex, checkAVX, null, null); } @@ -1064,10 +1063,11 @@ public final boolean vexPrefix(Register dst, Register nds, Register src, AVXSize * the {@code z} and {@code b} bits are unset ({@code 0}) when emitting an EVEX prefix and no * {@code opmask} register is assumed. * - * @see #vexPrefix(Register, Register, Register, Register, AVXSize, int, int, int, int, boolean, - * CPUFeature, CPUFeature, int, int) + * @see #vexPrefix(Register, Register, Register, Register, AVXKind.AVXSize, int, int, int, int, + * boolean, CPUFeature, CPUFeature, int, int) */ - public final boolean vexPrefix(Register dst, Register nds, Register src, AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, CPUFeature l256feature) { + public final boolean vexPrefix(Register dst, Register nds, Register src, AVXKind.AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, + CPUFeature l256feature) { return vexPrefix(dst, nds, src, Register.None, size, pp, mmmmm, w, wEvex, checkAVX, l128feature, l256feature, Z0, B0); } @@ -1076,18 +1076,18 @@ public final boolean vexPrefix(Register dst, Register nds, Register src, AVXSize * feature requirements. If the requirements indicate that a variable-length * ({@link CPUFeature#AVX512VL}) variant of the target instruction exists, an EVEX prefix is * emitted. {@code l128feature} denotes the requirements if the target register side - * ({@code size}) is {@link AVXSize#XMM} and {@code l256feature} defines the requirements for a - * register size of {@link AVXSize#YMM}. If any of those features is {@code null}, a VEX prefix - * is used for the corresponding register size. + * ({@code size}) is {@link AVXKind.AVXSize#XMM} and {@code l256feature} defines the + * requirements for a register size of {@link AVXKind.AVXSize#YMM}. If any of those features is + * {@code null}, a VEX prefix is used for the corresponding register size. *

* The Opmask ({@code opmask}) register is only used when emitting an EVEX prefix. *

* {@code z} and {@code b} denote bits in the EVEX prefix that define the merging/zeroing * behavior and are unused when emitting a VEX prefix. */ - public final boolean vexPrefix(Register dst, Register nds, Register src, Register opmask, AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, + public final boolean vexPrefix(Register dst, Register nds, Register src, Register opmask, AVXKind.AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, CPUFeature l256feature, int z, int b) { - if (isAVX512Register(dst) || isAVX512Register(nds) || isAVX512Register(src) || size == AVXSize.ZMM || + if (isAVX512Register(dst) || isAVX512Register(nds) || isAVX512Register(src) || size == AVXKind.AVXSize.ZMM || isVariableLengthAVX512Register(l128feature, l256feature, size)) { evexPrefix(dst, opmask, nds, src, size, pp, mmmmm, wEvex, z, b); return true; @@ -1102,10 +1102,11 @@ public final boolean vexPrefix(Register dst, Register nds, Register src, Registe * the source {@code src} operand is a memory location. Here, the {@code z} and {@code b} bits * are unset ({@code 0}) when emitting an EVEX prefix and no {@code opmask} register is assumed. * - * @see #vexPrefix(Register, Register, Register, Register, AVXSize, int, int, int, int, boolean, - * CPUFeature, CPUFeature, int, int) + * @see #vexPrefix(Register, Register, Register, Register, AVXKind.AVXSize, int, int, int, int, + * boolean, CPUFeature, CPUFeature, int, int) */ - public final boolean vexPrefix(Register dst, Register nds, AMD64Address src, AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, CPUFeature l256feature) { + public final boolean vexPrefix(Register dst, Register nds, AMD64Address src, AVXKind.AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, + CPUFeature l256feature) { return vexPrefix(dst, nds, src, Register.None, size, pp, mmmmm, w, wEvex, checkAVX, l128feature, l256feature, Z0, B0); } @@ -1114,12 +1115,12 @@ public final boolean vexPrefix(Register dst, Register nds, AMD64Address src, AVX * requirements for variable-length ({@link CPUFeature#AVX512VL}) AVX-512 instructions, where * the source {@code src} operand is a memory location. * - * @see #vexPrefix(Register, Register, Register, Register, AVXSize, int, int, int, int, boolean, - * CPUFeature, CPUFeature, int, int) + * @see #vexPrefix(Register, Register, Register, Register, AVXKind.AVXSize, int, int, int, int, + * boolean, CPUFeature, CPUFeature, int, int) */ - public final boolean vexPrefix(Register dst, Register nds, AMD64Address src, Register opmask, AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, + public final boolean vexPrefix(Register dst, Register nds, AMD64Address src, Register opmask, AVXKind.AVXSize size, int pp, int mmmmm, int w, int wEvex, boolean checkAVX, CPUFeature l128feature, CPUFeature l256feature, int z, int b) { - if (isAVX512Register(dst) || isAVX512Register(nds) || size == AVXSize.ZMM || isVariableLengthAVX512Register(l128feature, l256feature, size)) { + if (isAVX512Register(dst) || isAVX512Register(nds) || size == AVXKind.AVXSize.ZMM || isVariableLengthAVX512Register(l128feature, l256feature, size)) { evexPrefix(dst, opmask, nds, src, size, pp, mmmmm, wEvex, z, b); return true; } @@ -1202,7 +1203,7 @@ private static int verifyScalingFactor(int scalingFactor) { return scalingFactor; } - public int getDisp8ScalingFactor(AVXSize size) { + public int getDisp8ScalingFactor(AVXKind.AVXSize size) { switch (size) { case XMM: return verifyScalingFactor(scalingFactorVL128); @@ -1350,7 +1351,7 @@ private static int getRXBForEVEX(Register reg, Register rm) { /** * Helper method for emitting EVEX prefix in the form of RRRR. */ - protected final void evexPrefix(Register dst, Register mask, Register nds, Register src, AVXSize size, int pp, int mm, int w, int z, int b) { + protected final void evexPrefix(Register dst, Register mask, Register nds, Register src, AVXKind.AVXSize size, int pp, int mm, int w, int z, int b) { assert !mask.isValid() || inRC(MASK, mask); emitEVEX(getLFlag(size), pp, mm, w, getRXBForEVEX(dst, src), (dst == null ? 0 : dst.encoding), nds.isValid() ? nds.encoding() : 0, z, b, mask.isValid() ? mask.encoding : 0); } @@ -1361,7 +1362,7 @@ protected final void evexPrefix(Register dst, Register mask, Register nds, Regis * user of this API should make sure to encode the operands using * {@link #emitOperandHelper(Register, AMD64Address, int, int)}. */ - protected final void evexPrefix(Register dst, Register mask, Register nds, AMD64Address src, AVXSize size, int pp, int mm, int w, int z, int b) { + protected final void evexPrefix(Register dst, Register mask, Register nds, AMD64Address src, AVXKind.AVXSize size, int pp, int mm, int w, int z, int b) { assert !mask.isValid() || inRC(MASK, mask); emitEVEX(getLFlag(size), pp, mm, w, getRXB(dst, src), (dst == null ? 0 : dst.encoding), nds.isValid() ? nds.encoding() : 0, z, b, mask.isValid() ? mask.encoding : 0); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java index 3ce85f58af1f..c3e9c30da232 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/asm/amd64/AMD64MacroAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java @@ -22,29 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.asm.amd64; - -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.DEC; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.INC; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.core.common.NumUtil.isByte; +package jdk.compiler.graal.asm.amd64; + +import static jdk.compiler.graal.core.common.NumUtil.isByte; import java.util.function.IntConsumer; import java.util.function.Supplier; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; @@ -251,7 +240,7 @@ public final void incrementl(AMD64Address dst, int value) { public final void movflt(Register dst, Register src) { assert dst.getRegisterCategory().equals(AMD64.XMM) && src.getRegisterCategory().equals(AMD64.XMM); if (isAVX512Register(dst) || isAVX512Register(src)) { - VexMoveOp.VMOVAPS.emit(this, AVXSize.XMM, dst, src); + VexMoveOp.VMOVAPS.emit(this, AVXKind.AVXSize.XMM, dst, src); } else { movaps(dst, src); } @@ -260,7 +249,7 @@ public final void movflt(Register dst, Register src) { public final void movflt(Register dst, AMD64Address src) { assert dst.getRegisterCategory().equals(AMD64.XMM); if (isAVX512Register(dst)) { - VexMoveOp.VMOVSS.emit(this, AVXSize.XMM, dst, src); + VexMoveOp.VMOVSS.emit(this, AVXKind.AVXSize.XMM, dst, src); } else { movss(dst, src); } @@ -269,7 +258,7 @@ public final void movflt(Register dst, AMD64Address src) { public final void movflt(AMD64Address dst, Register src) { assert src.getRegisterCategory().equals(AMD64.XMM); if (isAVX512Register(src)) { - VexMoveOp.VMOVSS.emit(this, AVXSize.XMM, dst, src); + VexMoveOp.VMOVSS.emit(this, AVXKind.AVXSize.XMM, dst, src); } else { movss(dst, src); } @@ -278,7 +267,7 @@ public final void movflt(AMD64Address dst, Register src) { public final void movdbl(Register dst, Register src) { assert dst.getRegisterCategory().equals(AMD64.XMM) && src.getRegisterCategory().equals(AMD64.XMM); if (isAVX512Register(dst) || isAVX512Register(src)) { - VexMoveOp.VMOVAPD.emit(this, AVXSize.XMM, dst, src); + VexMoveOp.VMOVAPD.emit(this, AVXKind.AVXSize.XMM, dst, src); } else { movapd(dst, src); } @@ -287,7 +276,7 @@ public final void movdbl(Register dst, Register src) { public final void movdbl(Register dst, AMD64Address src) { assert dst.getRegisterCategory().equals(AMD64.XMM); if (isAVX512Register(dst)) { - VexMoveOp.VMOVSD.emit(this, AVXSize.XMM, dst, src); + VexMoveOp.VMOVSD.emit(this, AVXKind.AVXSize.XMM, dst, src); } else { movsd(dst, src); } @@ -296,7 +285,7 @@ public final void movdbl(Register dst, AMD64Address src) { public final void movdbl(AMD64Address dst, Register src) { assert src.getRegisterCategory().equals(AMD64.XMM); if (isAVX512Register(src)) { - VexMoveOp.VMOVSD.emit(this, AVXSize.XMM, dst, src); + VexMoveOp.VMOVSD.emit(this, AVXKind.AVXSize.XMM, dst, src); } else { movsd(dst, src); } @@ -569,11 +558,11 @@ public final void testAndJcc(OperandSize size, Register src, int imm32, Conditio } public final void testlAndJcc(Register src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyMIOpAndJcc(AMD64MIOp.TEST, DWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); + applyMIOpAndJcc(AMD64MIOp.TEST, OperandSize.DWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); } public final void testqAndJcc(Register src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyMIOpAndJcc(AMD64MIOp.TEST, QWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); + applyMIOpAndJcc(AMD64MIOp.TEST, OperandSize.QWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); } public final void testAndJcc(OperandSize size, AMD64Address src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp, IntConsumer applyBeforeFusedPair) { @@ -585,11 +574,11 @@ public final void testAndJcc(OperandSize size, Register src1, Register src2, Con } public final void testlAndJcc(Register src1, Register src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyRMOpAndJcc(AMD64RMOp.TEST, DWORD, src1, src2, cc, branchTarget, isShortJmp); + applyRMOpAndJcc(AMD64RMOp.TEST, OperandSize.DWORD, src1, src2, cc, branchTarget, isShortJmp); } public final void testqAndJcc(Register src1, Register src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyRMOpAndJcc(AMD64RMOp.TEST, QWORD, src1, src2, cc, branchTarget, isShortJmp); + applyRMOpAndJcc(AMD64RMOp.TEST, OperandSize.QWORD, src1, src2, cc, branchTarget, isShortJmp); } public final void testAndJcc(OperandSize size, Register src1, AMD64Address src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { @@ -609,64 +598,64 @@ public final void testbAndJcc(Register src1, AMD64Address src2, ConditionFlag cc } public final void cmpAndJcc(OperandSize size, Register src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyMIOpAndJcc(CMP.getMIOpcode(size, isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, false, null); + applyMIOpAndJcc(AMD64BinaryArithmetic.CMP.getMIOpcode(size, isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, false, null); } public final void cmpAndJcc(OperandSize size, Register src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp, boolean annotateImm, IntConsumer applyBeforeFusedPair) { - applyMIOpAndJcc(CMP.getMIOpcode(size, isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, annotateImm, applyBeforeFusedPair); + applyMIOpAndJcc(AMD64BinaryArithmetic.CMP.getMIOpcode(size, isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, annotateImm, applyBeforeFusedPair); } public final void cmplAndJcc(Register src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyMIOpAndJcc(CMP.getMIOpcode(DWORD, isByte(imm32)), DWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); + applyMIOpAndJcc(AMD64BinaryArithmetic.CMP.getMIOpcode(OperandSize.DWORD, isByte(imm32)), OperandSize.DWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); } public final void cmpqAndJcc(Register src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyMIOpAndJcc(CMP.getMIOpcode(QWORD, isByte(imm32)), QWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); + applyMIOpAndJcc(AMD64BinaryArithmetic.CMP.getMIOpcode(OperandSize.QWORD, isByte(imm32)), OperandSize.QWORD, src, imm32, cc, branchTarget, isShortJmp, false, null); } public final void cmpAndJcc(OperandSize size, AMD64Address src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyMIOpAndJcc(CMP.getMIOpcode(size, NumUtil.isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, false, null); + applyMIOpAndJcc(AMD64BinaryArithmetic.CMP.getMIOpcode(size, NumUtil.isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, false, null); } public final void cmpAndJcc(OperandSize size, AMD64Address src, int imm32, ConditionFlag cc, Label branchTarget, boolean isShortJmp, boolean annotateImm, IntConsumer applyBeforeFusedPair) { - applyMIOpAndJcc(CMP.getMIOpcode(size, NumUtil.isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, annotateImm, applyBeforeFusedPair); + applyMIOpAndJcc(AMD64BinaryArithmetic.CMP.getMIOpcode(size, NumUtil.isByte(imm32)), size, src, imm32, cc, branchTarget, isShortJmp, annotateImm, applyBeforeFusedPair); } public final void cmpAndJcc(OperandSize size, Register src1, Register src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyRMOpAndJcc(CMP.getRMOpcode(size), size, src1, src2, cc, branchTarget, isShortJmp); + applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(size), size, src1, src2, cc, branchTarget, isShortJmp); } public final void cmpAndJcc(OperandSize size, Register src1, AMD64Address src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyRMOpAndJcc(CMP.getRMOpcode(size), size, src1, src2, cc, branchTarget, isShortJmp, null); + applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(size), size, src1, src2, cc, branchTarget, isShortJmp, null); } public final void cmplAndJcc(Register src1, Register src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyRMOpAndJcc(CMP.getRMOpcode(DWORD), DWORD, src1, src2, cc, branchTarget, isShortJmp); + applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(OperandSize.DWORD), OperandSize.DWORD, src1, src2, cc, branchTarget, isShortJmp); } public final int cmpqAndJcc(Register src1, Register src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - return applyRMOpAndJcc(CMP.getRMOpcode(QWORD), QWORD, src1, src2, cc, branchTarget, isShortJmp); + return applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(OperandSize.QWORD), OperandSize.QWORD, src1, src2, cc, branchTarget, isShortJmp); } public final void cmpAndJcc(OperandSize size, Register src1, AMD64Address src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp, IntConsumer applyBeforeFusedPair) { - applyRMOpAndJcc(CMP.getRMOpcode(size), size, src1, src2, cc, branchTarget, isShortJmp, applyBeforeFusedPair); + applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(size), size, src1, src2, cc, branchTarget, isShortJmp, applyBeforeFusedPair); } public final void cmplAndJcc(Register src1, AMD64Address src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - applyRMOpAndJcc(CMP.getRMOpcode(DWORD), DWORD, src1, src2, cc, branchTarget, isShortJmp, null); + applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(OperandSize.DWORD), OperandSize.DWORD, src1, src2, cc, branchTarget, isShortJmp, null); } public final int cmpqAndJcc(Register src1, AMD64Address src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp) { - return applyRMOpAndJcc(CMP.getRMOpcode(QWORD), QWORD, src1, src2, cc, branchTarget, isShortJmp, null); + return applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(OperandSize.QWORD), OperandSize.QWORD, src1, src2, cc, branchTarget, isShortJmp, null); } public final int cmpqAndJcc(Register src1, AMD64Address src2, ConditionFlag cc, Label branchTarget, boolean isShortJmp, IntConsumer applyBeforeFusedPair) { - return applyRMOpAndJcc(CMP.getRMOpcode(QWORD), QWORD, src1, src2, cc, branchTarget, isShortJmp, applyBeforeFusedPair); + return applyRMOpAndJcc(AMD64BinaryArithmetic.CMP.getRMOpcode(OperandSize.QWORD), OperandSize.QWORD, src1, src2, cc, branchTarget, isShortJmp, applyBeforeFusedPair); } public final void cmpAndJcc(OperandSize size, Register src1, Supplier src2, ConditionFlag cc, Label branchTarget) { AMD64Address placeHolder = getPlaceholder(position()); - final AMD64RMOp op = CMP.getRMOpcode(size); + final AMD64RMOp op = AMD64BinaryArithmetic.CMP.getRMOpcode(size); final int bytesToEmit = getPrefixInBytes(size, src1, op.dstIsByte, placeHolder) + OPCODE_IN_BYTES + addressInBytes(placeHolder); alignFusedPair(branchTarget, false, bytesToEmit); final int beforeFusedPair = position(); @@ -678,71 +667,71 @@ public final void cmpAndJcc(OperandSize size, Register src1, Supplier maxRate && (periodExpired || total > MIN_COMPILATIONS_FOR_FAILURE_DETECTION)) { Formatter msg = new Formatter(); - String option = SystemicCompilationFailureRate.getName(); + String option = GraalCompilerOptions.SystemicCompilationFailureRate.getName(); msg.format("Warning: Systemic Graal compilation failure detected: %d of %d (%d%%) of compilations failed during last %d ms [max rate set by %s is %d%%]. ", failed, total, rate, period, option, maxRateValue); msg.format("To mitigate systemic compilation failure detection, set %s to a higher value. ", option); msg.format("To disable systemic compilation failure detection, set %s to 0. ", option); - msg.format("To get more information on compilation failures, set %s to Print or Diagnose. ", CompilationFailureAction.getName()); + msg.format("To get more information on compilation failures, set %s to Print or Diagnose. ", GraalCompilerOptions.CompilationFailureAction.getName()); TTY.println(msg.toString()); if (maxRateValue < 0) { // A negative value means the VM should be exited @@ -493,7 +489,7 @@ private static boolean detectCompilationFailureRateTooHigh(OptionValues options, */ private ExceptionAction adjustAction(OptionValues initialOptions, ExceptionAction initialAction, Throwable cause) { ExceptionAction action = initialAction; - int maxProblems = MaxCompilationProblemsPerAction.getValue(initialOptions); + int maxProblems = GraalCompilerOptions.MaxCompilationProblemsPerAction.getValue(initialOptions); if (action != ExceptionAction.ExitVM) { if (detectCompilationFailureRateTooHigh(initialOptions, cause)) { return ExceptionAction.ExitVM; @@ -503,8 +499,8 @@ private ExceptionAction adjustAction(OptionValues initialOptions, ExceptionActio int problems = problemsHandledPerAction.getOrDefault(action, 0); if (problems >= maxProblems) { if (problems == maxProblems) { - TTY.printf("Warning: adjusting %s from %s to %s after %s (%d) failed compilations%n", CompilationFailureAction, action, action.quieter(), - MaxCompilationProblemsPerAction, maxProblems); + TTY.printf("Warning: adjusting %s from %s to %s after %s (%d) failed compilations%n", GraalCompilerOptions.CompilationFailureAction, action, action.quieter(), + GraalCompilerOptions.MaxCompilationProblemsPerAction, maxProblems); // Ensure that the message above is only printed once problemsHandledPerAction.put(action, problems + 1); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/CompilerThread.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThread.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/CompilerThread.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThread.java index 397b3ee3b004..d75562ee8921 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/CompilerThread.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThread.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.serviceprovider.GraalServices; /** * A compiler thread is a daemon thread that runs at {@link Thread#MAX_PRIORITY}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/CompilerThreadFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThreadFactory.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/CompilerThreadFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThreadFactory.java index dd233bc3d7cc..1b6b978b97d0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/CompilerThreadFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThreadFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; import java.util.concurrent.ThreadFactory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalCompiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompiler.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalCompiler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompiler.java index e4cbf1391987..3ec33fee2abe 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalCompiler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompiler.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.RetryableBailoutException; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.MemUseTrackerKey; -import org.graalvm.compiler.debug.MethodFilter; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.asm.EntryPointDecorator; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.TargetProvider; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.meta.ProfilingInfo; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -262,8 +262,8 @@ private static String match(StructuredGraph graph, String methodPattern) { /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_org_graalvm_compiler_core_GraalCompiler} to optionally test routing fatal error - * handling from libgraal to HotSpot. + * Target_jdk_compiler_graal_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.internal.vm.compiler/src/org/graalvm/compiler/core/GraalCompilerOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompilerOptions.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalCompilerOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompilerOptions.java index adb4a74416c5..8807ac05f857 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalCompilerOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompilerOptions.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; -import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction; -import org.graalvm.compiler.options.EnumOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionType; +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; /** * Options related to {@link GraalCompiler}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalServiceThread.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalServiceThread.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalServiceThread.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalServiceThread.java index 127a07eceb86..c8f9a2cbbb8a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/GraalServiceThread.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalServiceThread.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; import jdk.vm.ci.services.Services; @@ -72,16 +72,14 @@ protected void onAttachError(InternalError error) { /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_org_graalvm_compiler_core_GraalServiceThread} to attach to the peer runtime if - * required. + * Target_jdk_compiler_graal_core_GraalServiceThread} to attach to the peer runtime if required. */ private void afterRun() { } /** * Substituted by {@code com.oracle.svm.graal.hotspot.libgraal. - * Target_org_graalvm_compiler_core_GraalServiceThread} to attach to the peer runtime if - * required. + * Target_jdk_compiler_graal_core_GraalServiceThread} to attach to the peer runtime if required. */ private void beforeRun() { } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/Instrumentation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/Instrumentation.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/Instrumentation.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/Instrumentation.java index fc6b6c2d38b0..63a950d7e115 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/Instrumentation.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/Instrumentation.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; /** * Interface in charge of holding the instrumentation data structures. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/LIRGenerationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/LIRGenerationPhase.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/LIRGenerationPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/LIRGenerationPhase.java index ee53a724aa71..ae3889bd52e2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/LIRGenerationPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/LIRGenerationPhase.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; import java.util.List; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.phases.LIRPhase; -import org.graalvm.compiler.lir.ssa.SSAUtil; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java index 36c481ec540c..5ddc9114a685 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64AddressLoweringByUse.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java @@ -24,20 +24,20 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.phases.common.AddressLoweringByUsePhase; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java index b2d4b0439e61..9bab5f369b04 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64AddressNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java @@ -23,21 +23,21 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; - -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java index 337078dd967d..7299681b563d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64ArithmeticLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java @@ -23,47 +23,46 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; - -import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_DREM; -import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_FREM; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; -import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.BSR; -import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CLZ; -import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.CTZ; -import static org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp.BitManipulationOpCode.POPCNT; - -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.CastValue; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; -import org.graalvm.compiler.lir.aarch64.AArch64BitManipulationOp; -import org.graalvm.compiler.lir.aarch64.AArch64BitSwapOp; -import org.graalvm.compiler.lir.aarch64.AArch64Convert; -import org.graalvm.compiler.lir.aarch64.AArch64FloatToHalfFloatOp; -import org.graalvm.compiler.lir.aarch64.AArch64HalfFloatToFloatOp; -import org.graalvm.compiler.lir.aarch64.AArch64MathCopySignOp; -import org.graalvm.compiler.lir.aarch64.AArch64MathSignumOp; -import org.graalvm.compiler.lir.aarch64.AArch64Move; -import org.graalvm.compiler.lir.aarch64.AArch64Move.LoadOp; -import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreOp; -import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreZeroOp; -import org.graalvm.compiler.lir.aarch64.AArch64NormalizedUnsignedCompareOp; -import org.graalvm.compiler.lir.aarch64.AArch64ReinterpretOp; -import org.graalvm.compiler.lir.aarch64.AArch64RoundFloatToIntegerOp; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool; +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; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; @@ -157,10 +156,10 @@ public Value emitRem(Value a, Value b, LIRFrameState state) { } else { switch ((AArch64Kind) a.getPlatformKind()) { case SINGLE: - ForeignCallLinkage fremCall = getLIRGen().getForeignCalls().lookupForeignCall(ARITHMETIC_FREM); + ForeignCallLinkage fremCall = getLIRGen().getForeignCalls().lookupForeignCall(Backend.ARITHMETIC_FREM); return getLIRGen().emitForeignCall(fremCall, state, a, b); case DOUBLE: - ForeignCallLinkage dremCall = getLIRGen().getForeignCalls().lookupForeignCall(ARITHMETIC_DREM); + ForeignCallLinkage dremCall = getLIRGen().getForeignCalls().lookupForeignCall(Backend.ARITHMETIC_DREM); return getLIRGen().emitForeignCall(dremCall, state, a, b); default: GraalError.shouldNotReachHere("emitRem on unexpected kind " + a.getPlatformKind()); // ExcludeFromJacocoGeneratedReport diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64BarrierSetLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64BarrierSetLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java index 0eb7c0573f8d..0c31627f3bef 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64BarrierSetLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.gen.BarrierSetLIRGenerator; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java index 96605962789d..8312b6c8e570 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java @@ -22,87 +22,87 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.asVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.isIntConstant; +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 java.util.EnumSet; import java.util.function.Function; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64AESDecryptOp; -import org.graalvm.compiler.lir.aarch64.AArch64AESEncryptOp; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; -import org.graalvm.compiler.lir.aarch64.AArch64ArrayCompareToOp; -import org.graalvm.compiler.lir.aarch64.AArch64ArrayCopyWithConversionsOp; -import org.graalvm.compiler.lir.aarch64.AArch64ArrayEqualsOp; -import org.graalvm.compiler.lir.aarch64.AArch64ArrayIndexOfOp; -import org.graalvm.compiler.lir.aarch64.AArch64ArrayRegionCompareToOp; -import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove; -import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove.AtomicReadAndWriteOp; -import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove.CompareAndSwapOp; -import org.graalvm.compiler.lir.aarch64.AArch64BigIntegerMulAddOp; -import org.graalvm.compiler.lir.aarch64.AArch64BigIntegerMultiplyToLenOp; -import org.graalvm.compiler.lir.aarch64.AArch64BigIntegerSquareToLenOp; -import org.graalvm.compiler.lir.aarch64.AArch64ByteSwap; -import org.graalvm.compiler.lir.aarch64.AArch64CacheWritebackOp; -import org.graalvm.compiler.lir.aarch64.AArch64CacheWritebackPostSyncOp; -import org.graalvm.compiler.lir.aarch64.AArch64CalcStringAttributesOp; -import org.graalvm.compiler.lir.aarch64.AArch64CipherBlockChainingAESDecryptOp; -import org.graalvm.compiler.lir.aarch64.AArch64CipherBlockChainingAESEncryptOp; -import org.graalvm.compiler.lir.aarch64.AArch64Compare; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.BranchOp; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CompareBranchZeroOp; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CondMoveOp; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.CondSetOp; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.HashTableSwitchOp; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.RangeTableSwitchOp; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp; -import org.graalvm.compiler.lir.aarch64.AArch64CountPositivesOp; -import org.graalvm.compiler.lir.aarch64.AArch64CounterModeAESCryptOp; -import org.graalvm.compiler.lir.aarch64.AArch64EncodeArrayOp; -import org.graalvm.compiler.lir.aarch64.AArch64GHASHProcessBlocksOp; -import org.graalvm.compiler.lir.aarch64.AArch64HaltOp; -import org.graalvm.compiler.lir.aarch64.AArch64MD5Op; -import org.graalvm.compiler.lir.aarch64.AArch64Move; -import org.graalvm.compiler.lir.aarch64.AArch64Move.MembarOp; -import org.graalvm.compiler.lir.aarch64.AArch64PauseOp; -import org.graalvm.compiler.lir.aarch64.AArch64SHA1Op; -import org.graalvm.compiler.lir.aarch64.AArch64SHA256Op; -import org.graalvm.compiler.lir.aarch64.AArch64SHA3Op; -import org.graalvm.compiler.lir.aarch64.AArch64SHA512Op; -import org.graalvm.compiler.lir.aarch64.AArch64SpeculativeBarrier; -import org.graalvm.compiler.lir.aarch64.AArch64StringLatin1InflateOp; -import org.graalvm.compiler.lir.aarch64.AArch64StringUTF16CompressOp; -import org.graalvm.compiler.lir.aarch64.AArch64VectorizedMismatchOp; -import org.graalvm.compiler.lir.aarch64.AArch64ZapRegistersOp; -import org.graalvm.compiler.lir.aarch64.AArch64ZapStackOp; -import org.graalvm.compiler.lir.aarch64.AArch64ZeroMemoryOp; -import org.graalvm.compiler.lir.gen.BarrierSetLIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.lir.gen.MoveFactory; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java index 58b23df1ba68..3ecd3b816ca1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LIRKindTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.core.common.spi.LIRKindTool; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LoweringProviderMixin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LoweringProviderMixin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java index 09034cece662..e200273235d9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64LoweringProviderMixin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java @@ -23,12 +23,12 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.nodes.memory.ExtendableMemoryAccess; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.spi.LoweringProvider; +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; public interface AArch64LoweringProviderMixin extends LoweringProvider { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java index 3248178bbb01..27c70fb9a232 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64MoveFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java @@ -23,21 +23,21 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import static org.graalvm.compiler.lir.LIRValueUtil.asConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; +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 org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.type.DataPointerConstant; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.aarch64.AArch64Move; -import org.graalvm.compiler.lir.aarch64.AArch64Move.LoadAddressOp; -import org.graalvm.compiler.lir.gen.MoveFactory; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java index a938856939a8..208e1a59299d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64NodeLIRBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java @@ -23,12 +23,12 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; +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; /** * This class implements the AArch64 specific portion of the LIR generator. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java index 2e2dd16bd077..6bcd58fddb7d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64NodeMatchRules.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java @@ -23,54 +23,54 @@ * questions. */ -package org.graalvm.compiler.core.aarch64; - +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; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.core.gen.NodeMatchRules; -import org.graalvm.compiler.core.match.ComplexMatchResult; -import org.graalvm.compiler.core.match.MatchRule; -import org.graalvm.compiler.core.match.MatchableNode; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; -import org.graalvm.compiler.lir.aarch64.AArch64BitFieldOp; -import org.graalvm.compiler.lir.aarch64.AArch64BitFieldOp.BitFieldOpCode; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.AndNode; -import org.graalvm.compiler.nodes.calc.BinaryNode; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.calc.IntegerConvertNode; -import org.graalvm.compiler.nodes.calc.IntegerLessThanNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.MulNode; -import org.graalvm.compiler.nodes.calc.NotNode; -import org.graalvm.compiler.nodes.calc.OrNode; -import org.graalvm.compiler.nodes.calc.RightShiftNode; -import org.graalvm.compiler.nodes.calc.ShiftNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.SubNode; -import org.graalvm.compiler.nodes.calc.UnaryNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; -import org.graalvm.compiler.nodes.calc.XorNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.memory.MemoryAccess; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64PointerAddNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java similarity index 75% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64PointerAddNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java index 61fd03d44955..1c01a6048f61 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64PointerAddNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java @@ -23,27 +23,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +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.StampFactory; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; @NodeInfo(nameTemplate = "AArch64PointerAdd", cycles = CYCLES_1, size = SIZE_1) public class AArch64PointerAddNode extends FloatingNode implements ArithmeticLIRLowerable { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java index 6d24edb75027..3fc22cc776fa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/aarch64/AArch64SuitesCreator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.aarch64; +package jdk.compiler.graal.core.aarch64; -import org.graalvm.compiler.java.DefaultSuitesCreator; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; +import jdk.compiler.graal.java.DefaultSuitesCreator; +import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; +import jdk.compiler.graal.phases.tiers.CompilerConfiguration; public abstract class AArch64SuitesCreator extends DefaultSuitesCreator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java index 9916c3650a9e..c04f946d716c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64AddressLowering.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java @@ -23,22 +23,22 @@ * questions. */ -package org.graalvm.compiler.core.amd64; - -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.phases.common.AddressLoweringByNodePhase.AddressLowering; +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; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java index 74b689d16975..bb6032daaa8b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64AddressNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java @@ -23,26 +23,26 @@ * questions. */ -package org.graalvm.compiler.core.amd64; - -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.spi.Simplifiable; -import org.graalvm.compiler.nodes.spi.SimplifierTool; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java index 954647332bcc..1df569621ad8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64ArithmeticLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java @@ -23,131 +23,131 @@ * questions. */ -package org.graalvm.compiler.core.amd64; - -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.CMP; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NEG; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.NOT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.BSF; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.BSR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.LZCNT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVZXB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.POPCNT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TEST; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TESTB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.SAR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.SHL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.SHR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEOp.MOVSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEOp.MOVSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VDIVSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VDIVSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VFMADD231SD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VFMADD231SS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VORPD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VORPS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMROp.VBLENDVPD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMROp.VBLENDVPS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMROp.VPBLENDVB; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; -import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; -import static org.graalvm.compiler.lir.amd64.AMD64Arithmetic.DREM; -import static org.graalvm.compiler.lir.amd64.AMD64Arithmetic.FREM; -import static org.graalvm.compiler.lir.amd64.vector.AMD64VectorUnary.FloatPointClassTestOp.NEG_INF; -import static org.graalvm.compiler.lir.amd64.vector.AMD64VectorUnary.FloatPointClassTestOp.POS_INF; - -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MROp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEMROp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexFloatCompareOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRVMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMROp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64Arithmetic.FPDivRemOp; -import org.graalvm.compiler.lir.amd64.AMD64ArithmeticLIRGeneratorTool; -import org.graalvm.compiler.lir.amd64.AMD64Binary; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer; -import org.graalvm.compiler.lir.amd64.AMD64BitSwapOp; -import org.graalvm.compiler.lir.amd64.AMD64ClearRegisterOp; -import org.graalvm.compiler.lir.amd64.AMD64FloatToHalfFloatOp; -import org.graalvm.compiler.lir.amd64.AMD64HalfFloatToFloatOp; -import org.graalvm.compiler.lir.amd64.AMD64MathCopySignOp; -import org.graalvm.compiler.lir.amd64.AMD64MathCosOp; -import org.graalvm.compiler.lir.amd64.AMD64MathExpOp; -import org.graalvm.compiler.lir.amd64.AMD64MathLog10Op; -import org.graalvm.compiler.lir.amd64.AMD64MathLogOp; -import org.graalvm.compiler.lir.amd64.AMD64MathPowOp; -import org.graalvm.compiler.lir.amd64.AMD64MathSignumOp; -import org.graalvm.compiler.lir.amd64.AMD64MathSinOp; -import org.graalvm.compiler.lir.amd64.AMD64MathTanOp; -import org.graalvm.compiler.lir.amd64.AMD64Move; -import org.graalvm.compiler.lir.amd64.AMD64MulDivOp; -import org.graalvm.compiler.lir.amd64.AMD64NormalizedUnsignedCompareOp; -import org.graalvm.compiler.lir.amd64.AMD64RoundFloatToIntegerOp; -import org.graalvm.compiler.lir.amd64.AMD64ShiftOp; -import org.graalvm.compiler.lir.amd64.AMD64SignExtendOp; -import org.graalvm.compiler.lir.amd64.AMD64Ternary; -import org.graalvm.compiler.lir.amd64.AMD64Unary; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorBinary; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorBinary.AVXBinaryConstFloatOp; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorBinary.AVXBinaryOp; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorBlend; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorFloatCompareOp; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorUnary; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGenerator; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool; +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; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64BarrierSetLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64BarrierSetLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java index 00a59b07ab68..09fd26651608 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64BarrierSetLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.gen.BarrierSetLIRGenerator; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64CompressAddressLowering.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64CompressAddressLowering.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java index 31916c57f288..59748cf0c631 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64CompressAddressLowering.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java @@ -23,26 +23,26 @@ * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; +import jdk.compiler.graal.core.common.type.StampFactory; +import jdk.compiler.graal.debug.CounterKey; +import jdk.compiler.graal.debug.DebugContext; import jdk.vm.ci.code.Register; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; - -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +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; public abstract class AMD64CompressAddressLowering extends AMD64AddressLowering { private static final CounterKey counterFoldedUncompressDuringAddressLowering = DebugContext.counter("FoldedUncompressDuringAddressLowering"); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java index 8093e467ead9..7960841e5e6d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java @@ -23,118 +23,118 @@ * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.BYTE; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; -import static org.graalvm.compiler.lir.LIRValueUtil.asConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isIntConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +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 java.util.EnumSet; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.StandardOp.JumpOp; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64AESDecryptOp; -import org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64ArithmeticLIRGeneratorTool; -import org.graalvm.compiler.lir.amd64.AMD64ArrayCompareToOp; -import org.graalvm.compiler.lir.amd64.AMD64ArrayCopyWithConversionsOp; -import org.graalvm.compiler.lir.amd64.AMD64ArrayEqualsOp; -import org.graalvm.compiler.lir.amd64.AMD64ArrayIndexOfOp; -import org.graalvm.compiler.lir.amd64.AMD64ArrayRegionCompareToOp; -import org.graalvm.compiler.lir.amd64.AMD64BigIntegerMulAddOp; -import org.graalvm.compiler.lir.amd64.AMD64BigIntegerMultiplyToLenOp; -import org.graalvm.compiler.lir.amd64.AMD64BigIntegerSquareToLenOp; -import org.graalvm.compiler.lir.amd64.AMD64Binary; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer; -import org.graalvm.compiler.lir.amd64.AMD64ByteSwapOp; -import org.graalvm.compiler.lir.amd64.AMD64CacheWritebackOp; -import org.graalvm.compiler.lir.amd64.AMD64CacheWritebackPostSyncOp; -import org.graalvm.compiler.lir.amd64.AMD64CalcStringAttributesOp; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64CipherBlockChainingAESDecryptOp; -import org.graalvm.compiler.lir.amd64.AMD64CipherBlockChainingAESEncryptOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.BranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CmpBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CmpConstBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CmpDataBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CondMoveOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.CondSetOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.FloatBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.FloatCondMoveOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.FloatCondSetOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.HashTableSwitchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.RangeTableSwitchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.StrategySwitchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.TestBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.TestByteBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.TestConstBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64CountPositivesOp; -import org.graalvm.compiler.lir.amd64.AMD64CounterModeAESCryptOp; -import org.graalvm.compiler.lir.amd64.AMD64EncodeArrayOp; -import org.graalvm.compiler.lir.amd64.AMD64GHASHProcessBlocksOp; -import org.graalvm.compiler.lir.amd64.AMD64HaltOp; -import org.graalvm.compiler.lir.amd64.AMD64LFenceOp; -import org.graalvm.compiler.lir.amd64.AMD64MD5Op; -import org.graalvm.compiler.lir.amd64.AMD64Move; -import org.graalvm.compiler.lir.amd64.AMD64Move.CompareAndSwapOp; -import org.graalvm.compiler.lir.amd64.AMD64Move.MembarOp; -import org.graalvm.compiler.lir.amd64.AMD64Move.StackLeaOp; -import org.graalvm.compiler.lir.amd64.AMD64PauseOp; -import org.graalvm.compiler.lir.amd64.AMD64SHA1Op; -import org.graalvm.compiler.lir.amd64.AMD64SHA256AVX2Op; -import org.graalvm.compiler.lir.amd64.AMD64SHA256Op; -import org.graalvm.compiler.lir.amd64.AMD64SHA512Op; -import org.graalvm.compiler.lir.amd64.AMD64StringLatin1InflateOp; -import org.graalvm.compiler.lir.amd64.AMD64StringUTF16CompressOp; -import org.graalvm.compiler.lir.amd64.AMD64VectorizedHashCodeOp; -import org.graalvm.compiler.lir.amd64.AMD64VectorizedMismatchOp; -import org.graalvm.compiler.lir.amd64.AMD64ZapRegistersOp; -import org.graalvm.compiler.lir.amd64.AMD64ZapStackOp; -import org.graalvm.compiler.lir.amd64.AMD64ZeroMemoryOp; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorCompareOp; -import org.graalvm.compiler.lir.gen.BarrierSetLIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.lir.gen.MoveFactory; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java index 6df65aec0ccf..26e49adc62fe 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LIRKindTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.spi.LIRKindTool; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.core.common.LIRKind; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LoweringProviderMixin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LoweringProviderMixin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java index b75fd605b08a..816f376ec02e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64LoweringProviderMixin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java @@ -23,24 +23,24 @@ * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.calc.SubNode; -import org.graalvm.compiler.nodes.memory.ExtendableMemoryAccess; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.nodes.spi.LoweringProvider; -import org.graalvm.compiler.replacements.nodes.BitScanForwardNode; -import org.graalvm.compiler.replacements.nodes.BitScanReverseNode; -import org.graalvm.compiler.replacements.nodes.CountLeadingZerosNode; -import org.graalvm.compiler.replacements.nodes.CountTrailingZerosNode; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java index 2edccb8d1a8b..c74500f0a8c4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64MoveFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java @@ -23,27 +23,27 @@ * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.asConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; +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 org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.type.DataPointerConstant; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.amd64.AMD64Move; -import org.graalvm.compiler.lir.amd64.AMD64Move.AMD64StackMove; -import org.graalvm.compiler.lir.amd64.AMD64Move.LeaDataOp; -import org.graalvm.compiler.lir.amd64.AMD64Move.LeaOp; -import org.graalvm.compiler.lir.amd64.AMD64Move.MoveFromConstOp; -import org.graalvm.compiler.lir.amd64.AMD64Move.MoveFromRegOp; -import org.graalvm.compiler.lir.amd64.AMD64Move.MoveToRegOp; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java index 5b187a817bc4..dc0a885323c4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64MoveFactoryBase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java @@ -23,15 +23,15 @@ * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; +import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; +import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.amd64.AMD64Move.AMD64PushPopStackMove; -import org.graalvm.compiler.lir.gen.MoveFactory; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java index 607f1977819a..ee60eed53950 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java @@ -23,23 +23,23 @@ * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.IndirectCallTargetNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode.Op; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java index aca624ada317..6c0f4271aabd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64NodeMatchRules.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java @@ -23,73 +23,74 @@ * questions. */ -package org.graalvm.compiler.core.amd64; - -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.ADD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.AND; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.SUB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOVSXD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64Shift.ROL; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VADDSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VMULSS; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VSUBSS; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.SS; - -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.core.gen.NodeMatchRules; -import org.graalvm.compiler.core.match.ComplexMatchResult; -import org.graalvm.compiler.core.match.MatchRule; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64BinaryConsumer; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.TestBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.TestConstBranchOp; -import org.graalvm.compiler.lir.amd64.AMD64UnaryConsumer; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.CompareNode; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.NarrowNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode; -import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode; -import org.graalvm.compiler.nodes.memory.AddressableMemoryAccess; -import org.graalvm.compiler.nodes.memory.LIRLowerableAccess; -import org.graalvm.compiler.nodes.memory.MemoryAccess; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.util.GraphUtil; +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; import jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; @@ -678,25 +679,25 @@ public ComplexMatchResult signExtendNarrowRead(SignExtendNode root, NarrowNode n @MatchRule("(FloatConvert FloatingRead=access)") public ComplexMatchResult floatConvert(FloatConvertNode root, LIRLowerableAccess access) { switch (root.getFloatConvert()) { - case D2F: + case FloatConvert.D2F: return emitConvertMemoryOp(AMD64Kind.SINGLE, SSEOp.CVTSD2SS, SD, access); - case D2I: + case FloatConvert.D2I: return emitConvertMemoryOp(AMD64Kind.DWORD, SSEOp.CVTTSD2SI, DWORD, access); - case D2L: + case FloatConvert.D2L: return emitConvertMemoryOp(AMD64Kind.QWORD, SSEOp.CVTTSD2SI, QWORD, access); - case F2D: + case FloatConvert.F2D: return emitConvertMemoryOp(AMD64Kind.DOUBLE, SSEOp.CVTSS2SD, SS, access); - case F2I: + case FloatConvert.F2I: return emitConvertMemoryOp(AMD64Kind.DWORD, SSEOp.CVTTSS2SI, DWORD, access); - case F2L: + case FloatConvert.F2L: return emitConvertMemoryOp(AMD64Kind.QWORD, SSEOp.CVTTSS2SI, QWORD, access); - case I2D: + case FloatConvert.I2D: return emitConvertMemoryOp(AMD64Kind.DOUBLE, SSEOp.CVTSI2SD, DWORD, access); - case I2F: + case FloatConvert.I2F: return emitConvertMemoryOp(AMD64Kind.SINGLE, SSEOp.CVTSI2SS, DWORD, access); - case L2D: + case FloatConvert.L2D: return emitConvertMemoryOp(AMD64Kind.DOUBLE, SSEOp.CVTSI2SD, QWORD, access); - case L2F: + case FloatConvert.L2F: return emitConvertMemoryOp(AMD64Kind.SINGLE, SSEOp.CVTSI2SS, QWORD, access); default: throw GraalError.shouldNotReachHereUnexpectedValue(root.getFloatConvert()); // ExcludeFromJacocoGeneratedReport diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java index 44ab48129669..c342e1fa83d4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/AMD64SuitesCreator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; import java.util.ListIterator; -import org.graalvm.compiler.java.DefaultSuitesCreator; -import org.graalvm.compiler.lir.amd64.phases.StackMoveOptimizationPhase; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.UseTrappingNullChecksPhase; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/UseTrappingDivPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/UseTrappingDivPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java index 477dc2535c68..38877dbe0e4e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/amd64/UseTrappingDivPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.amd64; +package jdk.compiler.graal.core.amd64; import java.util.Optional; +import jdk.compiler.graal.debug.GraalError; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractDeoptimizeNode; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; -import org.graalvm.compiler.nodes.DynamicDeoptimizeNode; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.calc.SignedDivNode; -import org.graalvm.compiler.nodes.calc.SignedRemNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.extended.MultiGuardNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.UseTrappingNullChecksPhase; -import org.graalvm.compiler.phases.common.UseTrappingOperationPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.LowTierContext; +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.vm.ci.meta.DeoptimizationReason; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/BootstrapMethodIntrospection.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/BootstrapMethodIntrospection.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java index fd51d9491412..f624d0c500b6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/BootstrapMethodIntrospection.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import java.lang.invoke.MethodType; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CancellationBailoutException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CancellationBailoutException.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CancellationBailoutException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CancellationBailoutException.java index 1811b9bda9f7..f78de37fdcae 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CancellationBailoutException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CancellationBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; /** * A {@linkplain RetryableBailoutException} that will be thrown if an on-going compilation in the diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationIdentifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationIdentifier.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationIdentifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationIdentifier.java index 2ff7a15a3351..c814c974851a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationIdentifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationIdentifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import jdk.vm.ci.code.CompilationRequest; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationListenerProfiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationListenerProfiler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java index 08d6cf7693e2..91e739a1747a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationListenerProfiler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; -import org.graalvm.compiler.debug.CompilationListener; -import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; +import jdk.compiler.graal.debug.CompilationListener; +import jdk.compiler.graal.debug.DebugContext; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -51,9 +51,9 @@ public void notifyInlining(ResolvedJavaMethod caller, ResolvedJavaMethod callee, } @Override - public CompilerPhaseScope enterPhase(CharSequence name, int nesting) { + public DebugContext.CompilerPhaseScope enterPhase(CharSequence name, int nesting) { long start = profiler.getTicks(); - return new CompilerPhaseScope() { + return new DebugContext.CompilerPhaseScope() { @Override public void close() { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java index fe6aa3eac62f..19166c854f9a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilationRequestIdentifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import jdk.vm.ci.code.CompilationRequest; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilerProfiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilerProfiler.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilerProfiler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilerProfiler.java index 2ed5037d0082..eb80b4cb2b16 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompilerProfiler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilerProfiler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompressEncoding.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompressEncoding.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompressEncoding.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompressEncoding.java index 6908c0059157..73d88e5a050f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/CompressEncoding.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompressEncoding.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; /** * A compact representation of the different encoding strategies for Objects and metadata. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/FieldIntrospection.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldIntrospection.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/FieldIntrospection.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldIntrospection.java index 20423721fe1f..1ef2cb6f0a18 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/FieldIntrospection.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldIntrospection.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; public abstract class FieldIntrospection { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/Fields.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Fields.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/Fields.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Fields.java index 5326800c259e..83508569213f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/Fields.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Fields.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; -import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/FieldsScanner.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldsScanner.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/FieldsScanner.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldsScanner.java index f86d908add93..35f305ca7dcd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/FieldsScanner.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldsScanner.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; -import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.lang.reflect.Field; import java.lang.reflect.Modifier; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/GraalBailoutException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalBailoutException.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/GraalBailoutException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalBailoutException.java index 8f0543fe147a..1cc07bc105fd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/GraalBailoutException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalBailoutException.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; +import jdk.compiler.graal.debug.CausableByCompilerAssert; import jdk.vm.ci.code.BailoutException; -import org.graalvm.compiler.debug.CausableByCompilerAssert; @SuppressWarnings("serial") public class GraalBailoutException extends BailoutException implements CausableByCompilerAssert { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/GraalOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalOptions.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/GraalOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalOptions.java index e3ab40ecffa9..5f7cfbd1425b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/GraalOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalOptions.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionType; +import jdk.compiler.graal.options.Option; +import jdk.compiler.graal.options.OptionKey; +import jdk.compiler.graal.options.OptionStability; +import jdk.compiler.graal.options.OptionType; /** * This class encapsulates options that control the behavior of the GraalVM compiler. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/LIRKind.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKind.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/LIRKind.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKind.java index 0f7f2ce95458..df8ffd1ba38a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/LIRKind.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKind.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/LIRKindWithCast.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKindWithCast.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/LIRKindWithCast.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKindWithCast.java index 78c7d02c2cea..6f313f0209f9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/LIRKindWithCast.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKindWithCast.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import jdk.vm.ci.meta.ValueKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/NumUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/NumUtil.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/NumUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/NumUtil.java index 5bb0b4e0dc67..8aedc1ea63de 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/NumUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/NumUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; // JaCoCo Exclude diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/PermanentBailoutException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/PermanentBailoutException.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/PermanentBailoutException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/PermanentBailoutException.java index 4c1983bed322..4aaf6a372e96 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/PermanentBailoutException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/PermanentBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; public class PermanentBailoutException extends GraalBailoutException { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/RetryableBailoutException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/RetryableBailoutException.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/RetryableBailoutException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/RetryableBailoutException.java index fd242873819b..eca42c38801d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/RetryableBailoutException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/RetryableBailoutException.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; public class RetryableBailoutException extends GraalBailoutException { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SpectrePHTMitigations.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SpectrePHTMitigations.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java index f0b88735d815..0418737dab38 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SpectrePHTMitigations.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.UnmodifiableEconomicMap; -import org.graalvm.compiler.options.EnumOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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; public enum SpectrePHTMitigations { None, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/Stride.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Stride.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/Stride.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Stride.java index 54fc052968d3..1e91c9f76ec3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/Stride.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Stride.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/StrideUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/StrideUtil.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/StrideUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/StrideUtil.java index 7601ebc5ed84..abd207429e4d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/StrideUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/StrideUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import static jdk.vm.ci.code.ValueUtil.isIllegal; @@ -30,12 +30,12 @@ /** * This class provides utility methods for "stride-agnostic" intrinsic nodes such as - * {@code org.graalvm.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 into one as follows: {@code (strideA * N_STRIDES) + strideB}. This value is used inside - * the intrinsic as a jump table index to dispatch to separately compiled versions for each possible + * {@link jdk.compiler.graal.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 + * into one as follows: {@code (strideA * N_STRIDES) + strideB}. This value is used inside the + * intrinsic as a jump table index to dispatch to separately compiled versions for each possible * combination of strides. */ public final class StrideUtil { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java index 11d3194e16a2..5679095e0064 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SuppressFBWarnings.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SuppressSVMWarnings.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SuppressSVMWarnings.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java index 658650b0940b..0d12ba595ec7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/SuppressSVMWarnings.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common; +package jdk.compiler.graal.core.common; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/BasicBlockOrderUtils.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/BasicBlockOrderUtils.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java index 47f21069ef51..d67f4474874c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/BasicBlockOrderUtils.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.alloc; +package jdk.compiler.graal.core.common.alloc; import java.util.ArrayList; import java.util.BitSet; import java.util.Comparator; import java.util.PriorityQueue; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder.ComputationTime; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.cfg.BasicBlock; +import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder.ComputationTime; +import jdk.compiler.graal.debug.GraalError; public final class BasicBlockOrderUtils { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/DefaultCodeEmissionOrder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/DefaultCodeEmissionOrder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java index c96a64acdb38..09d043ec5d33 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/DefaultCodeEmissionOrder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java @@ -23,17 +23,16 @@ * questions. */ -package org.graalvm.compiler.core.common.alloc; +package jdk.compiler.graal.core.common.alloc; import java.util.BitSet; import java.util.PriorityQueue; -import org.graalvm.compiler.core.common.alloc.BasicBlockOrderUtils.BlockList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph; -import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.options.OptionValues; +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; /** * Computes an ordering of the blocks that can be used by the machine code generator. The machine @@ -65,7 +64,7 @@ public DefaultCodeEmissionOrder(int originalBlockCount, T startBlock) { */ @Override public int[] computeCodeEmittingOrder(OptionValues options, ComputationTime computationTime) { - BlockList order = new BlockList<>(originalBlockCount); + BasicBlockOrderUtils.BlockList order = new BasicBlockOrderUtils.BlockList<>(originalBlockCount); BitSet visitedBlocks = new BitSet(originalBlockCount); PriorityQueue worklist = BasicBlockOrderUtils.initializeWorklist(startBlock, visitedBlocks); computeCodeEmittingOrder(order, worklist, visitedBlocks, computationTime); @@ -76,7 +75,7 @@ public int[] computeCodeEmittingOrder(OptionValues options, ComputationTime comp /** * Iteratively adds paths to the code emission block order. */ - private static > void computeCodeEmittingOrder(BlockList order, PriorityQueue worklist, BitSet visitedBlocks, ComputationTime computationTime) { + private static > void computeCodeEmittingOrder(BasicBlockOrderUtils.BlockList order, PriorityQueue worklist, BitSet visitedBlocks, ComputationTime computationTime) { while (!worklist.isEmpty()) { T nextImportantPath = worklist.poll(); addPathToCodeEmittingOrder(nextImportantPath, order, worklist, visitedBlocks, computationTime); @@ -86,7 +85,7 @@ private static > void computeCodeEmittingOrder(BlockList /** * Add a linear path to the code emission order greedily following the most likely successor. */ - private static > void addPathToCodeEmittingOrder(T initialBlock, BlockList order, PriorityQueue worklist, BitSet visitedBlocks, + private static > void addPathToCodeEmittingOrder(T initialBlock, BasicBlockOrderUtils.BlockList order, PriorityQueue worklist, BitSet visitedBlocks, ComputationTime computationTime) { T block = initialBlock; while (block != null) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/LinearScanOrder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/LinearScanOrder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java index 3bed256e79db..785ea1a8641b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/LinearScanOrder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.alloc; +package jdk.compiler.graal.core.common.alloc; import java.util.BitSet; import java.util.PriorityQueue; -import org.graalvm.compiler.core.common.alloc.BasicBlockOrderUtils.BlockList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph; +import jdk.compiler.graal.core.common.cfg.BasicBlock; +import jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph; /** * Computes an ordering of the blocks that can be used by the linear scan register allocator. @@ -55,7 +54,7 @@ public final class LinearScanOrder { * {@link AbstractControlFlowGraph} */ public static > int[] computeLinearScanOrder(int originalBlockCount, T startBlock) { - BlockList order = new BlockList<>(originalBlockCount); + BasicBlockOrderUtils.BlockList order = new BasicBlockOrderUtils.BlockList<>(originalBlockCount); BitSet visitedBlocks = new BitSet(originalBlockCount); PriorityQueue worklist = BasicBlockOrderUtils.initializeWorklist(startBlock, visitedBlocks); computeLinearScanOrder(order, worklist, visitedBlocks); @@ -71,7 +70,7 @@ public static > int[] computeLinearScanOrder(int origina /** * Iteratively adds paths to the linear scan block order. */ - private static > void computeLinearScanOrder(BlockList order, PriorityQueue worklist, BitSet visitedBlocks) { + private static > void computeLinearScanOrder(BasicBlockOrderUtils.BlockList order, PriorityQueue worklist, BitSet visitedBlocks) { while (!worklist.isEmpty()) { T nextImportantPath = worklist.poll(); do { @@ -83,7 +82,7 @@ private static > void computeLinearScanOrder(BlockList> T addPathToLinearScanOrder(T block, BlockList order, PriorityQueue worklist, BitSet visitedBlocks) { + private static > T addPathToLinearScanOrder(T block, BasicBlockOrderUtils.BlockList order, PriorityQueue worklist, BitSet visitedBlocks) { block.setLinearScanNumber(order.size()); order.add(block); T mostLikelySuccessor = BasicBlockOrderUtils.findAndMarkMostLikelySuccessor(block, order, visitedBlocks); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java index c2c3ab7e0236..1cb36f48dd66 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/alloc/RegisterAllocationConfig.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.alloc; +package jdk.compiler.graal.core.common.alloc; import java.util.Arrays; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.GraalOptions; +import jdk.compiler.graal.core.common.GraalOptions; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.Register.RegisterCategory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/CanonicalCondition.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/CanonicalCondition.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java index b3de398cdf73..77aa7ca7b2c6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/CanonicalCondition.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.calc; +package jdk.compiler.graal.core.common.calc; -import org.graalvm.compiler.core.common.type.Stamp; +import jdk.compiler.graal.core.common.type.Stamp; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/Condition.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/Condition.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/Condition.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/Condition.java index 402b37afa213..ca2762557a16 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/Condition.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/Condition.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.calc; +package jdk.compiler.graal.core.common.calc; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.type.Stamp; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/FloatConvert.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvert.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/FloatConvert.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvert.java index 9235aff43737..e7e1604a00aa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/FloatConvert.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvert.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.calc; +package jdk.compiler.graal.core.common.calc; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.PrimitiveStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; +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; public enum FloatConvert { F2I(FloatConvertCategory.FloatingPointToInteger, 32), diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java index 1d46aaf63fdd..52389ea5ff36 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/FloatConvertCategory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.calc; +package jdk.compiler.graal.core.common.calc; public enum FloatConvertCategory { FloatingPointToInteger, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/ReinterpretUtils.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/ReinterpretUtils.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java index a4648eb8ca16..c3f0e69461e4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/ReinterpretUtils.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.calc; +package jdk.compiler.graal.core.common.calc; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import org.graalvm.compiler.core.common.type.ArithmeticStamp; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; +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.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java index 00e80d248839..fb6ca62753af 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/calc/UnsignedMath.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.calc; +package jdk.compiler.graal.core.common.calc; //JaCoCo Exclude diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java index 935e825b498d..22ff1c217a28 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/AbstractControlFlowGraph.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; import java.util.Collection; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BasicBlock.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BasicBlock.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java index 47402077f360..ae84f35da2fd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BasicBlock.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java @@ -22,9 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; - -import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; +package jdk.compiler.graal.core.common.cfg; import java.util.Comparator; @@ -45,23 +43,23 @@ public abstract class BasicBlock> { * well as its index into the @{@link #getBlocks()} array of the associated * {@link AbstractControlFlowGraph}. */ - protected int id = INVALID_BLOCK_ID; + protected int id = AbstractControlFlowGraph.INVALID_BLOCK_ID; /** * Block id of the dominator of this block. See * dominator theory for * details. */ - private int dominator = INVALID_BLOCK_ID; + private int dominator = AbstractControlFlowGraph.INVALID_BLOCK_ID; /** * Block id of the first dominated block. A block can dominate more basic blocks: they are * connected sequentially via the {@link BasicBlock#dominatedSibling} index pointer into the * {@link #getBlocks()}array. */ - private int firstDominated = INVALID_BLOCK_ID; + private int firstDominated = AbstractControlFlowGraph.INVALID_BLOCK_ID; /** * The dominated sibling of this block. See {@link BasicBlock#firstDominated} for details. */ - private int dominatedSibling = INVALID_BLOCK_ID; + private int dominatedSibling = AbstractControlFlowGraph.INVALID_BLOCK_ID; /** * See {@link #getDominatorDepth()}. */ @@ -80,14 +78,14 @@ public abstract class BasicBlock> { * dominated blocks between {@code this} and the deepest dominated block in dominator tree are * within the {@code [domNumber;maxChildDomNumber]} interval. */ - private int domNumber = INVALID_BLOCK_ID; + private int domNumber = AbstractControlFlowGraph.INVALID_BLOCK_ID; /** * The maximum child dominator number, i.e., the maximum dom number of the deepest dominated * block along the particular branch on the dominator tree rooted at this block. * * See {@link #domNumber} for details. */ - private int maxChildDomNumber = INVALID_BLOCK_ID; + private int maxChildDomNumber = AbstractControlFlowGraph.INVALID_BLOCK_ID; /** * Indicates if this block is a target of an indirect branch. */ @@ -107,14 +105,14 @@ public void setMaxChildDomNumber(int maxChildDomNumber) { } public int getDominatorNumber() { - if (domNumber == INVALID_BLOCK_ID) { + if (domNumber == AbstractControlFlowGraph.INVALID_BLOCK_ID) { return -1; } return domNumber; } public int getMaxChildDominatorNumber() { - if (maxChildDomNumber == INVALID_BLOCK_ID) { + if (maxChildDomNumber == AbstractControlFlowGraph.INVALID_BLOCK_ID) { return -1; } return this.maxChildDomNumber; @@ -166,7 +164,7 @@ public boolean containsSucc(T key) { public abstract double getSuccessorProbabilityAt(int succIndex); public T getDominator() { - return dominator != INVALID_BLOCK_ID ? cfg.getBlocks()[dominator] : null; + return dominator != AbstractControlFlowGraph.INVALID_BLOCK_ID ? cfg.getBlocks()[dominator] : null; } /** @@ -214,7 +212,7 @@ public int getDominatorDepth() { } public T getFirstDominated() { - return firstDominated != INVALID_BLOCK_ID ? cfg.getBlocks()[firstDominated] : null; + return firstDominated != AbstractControlFlowGraph.INVALID_BLOCK_ID ? cfg.getBlocks()[firstDominated] : null; } public void setFirstDominated(T block) { @@ -222,7 +220,7 @@ public void setFirstDominated(T block) { } public T getDominatedSibling() { - return dominatedSibling != INVALID_BLOCK_ID ? cfg.getBlocks()[dominatedSibling] : null; + return dominatedSibling != AbstractControlFlowGraph.INVALID_BLOCK_ID ? cfg.getBlocks()[dominatedSibling] : null; } public void setDominatedSibling(T block) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BasicBlockSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BasicBlockSet.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java index d63388b2256f..31c0e0162ad4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BasicBlockSet.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; import java.util.BitSet; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BlockMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BlockMap.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BlockMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BlockMap.java index 316d287e97fe..a32d390e8b6b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/BlockMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BlockMap.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; public class BlockMap { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java index 67765dbfb3b8..cd9a7a83b67a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/CFGVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; import java.util.ArrayDeque; import java.util.Deque; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/CodeEmissionOrder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/CodeEmissionOrder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java index 06dc3d289370..461b9b645562 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/CodeEmissionOrder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java @@ -23,9 +23,9 @@ * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java index 9b34dbfcd0dc..a0c255cde8cd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/DominatorOptimizationProblem.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; import java.util.Arrays; import java.util.BitSet; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/Loop.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/Loop.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/Loop.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/Loop.java index 711d41d8303c..75764359358d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/Loop.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/Loop.java @@ -23,9 +23,9 @@ * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; -import static org.graalvm.compiler.core.common.cfg.BasicBlock.BLOCK_ID_COMPARATOR; +import static jdk.compiler.graal.core.common.cfg.BasicBlock.BLOCK_ID_COMPARATOR; import java.util.ArrayList; import java.util.Collections; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java index d40d2fae328a..de47f2df83cc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/cfg/PropertyConsumable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.cfg; +package jdk.compiler.graal.core.common.cfg; import java.util.function.BiConsumer; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/doc-files/TraceInliningHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/doc-files/TraceInliningHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/BarrierType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/BarrierType.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/BarrierType.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/BarrierType.java index 9f9354e77965..9fdb48a93204 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/BarrierType.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/BarrierType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.memory; +package jdk.compiler.graal.core.common.memory; /** * The types of write and read barriers attached to memory operations. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/MemoryExtendKind.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/MemoryExtendKind.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java index 064c1da7124f..fd1e7a5a216b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/MemoryExtendKind.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.memory; +package jdk.compiler.graal.core.common.memory; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; +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; /** * Enumerates the different extend kinds which may be able to be folded into an diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/MemoryOrderMode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/MemoryOrderMode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java index 5ff09608cdcc..f74479bb0037 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/memory/MemoryOrderMode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.memory; +package jdk.compiler.graal.core.common.memory; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java index f1822869bc0f..d8c6b06b4402 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/CodeGenProviders.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java index 858ed3d2a404..ed53402805c6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ConstantFieldProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java index 8efeedc8e020..13cd87527985 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallDescriptor.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java index ecb3136b786f..55f7ee3e5f4c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallLinkage.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; import jdk.vm.ci.code.CallingConvention; import jdk.vm.ci.meta.InvokeTarget; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallSignature.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallSignature.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java index 25102cffaf61..3eaa62bc11af 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallSignature.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; import java.util.Arrays; import java.util.regex.Pattern; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; /** * The name and signature of a {@link ForeignCallDescriptor foreign call}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java index 59316d94ec2a..78e4b3b1ecc2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/ForeignCallsProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; -import org.graalvm.compiler.core.common.LIRKind; +import jdk.compiler.graal.core.common.LIRKind; import jdk.vm.ci.code.ValueKindFactory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java index 2149108b39e0..81f9825376c4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/JavaConstantFieldProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; import java.util.Arrays; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.options.Option; +import jdk.compiler.graal.options.OptionKey; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java index b9fd9d0b4ad0..9c484dd8bd66 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/LIRKindTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; -import org.graalvm.compiler.core.common.LIRKind; +import jdk.compiler.graal.core.common.LIRKind; /** * This interface can be used to access platform and VM specific kinds. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java index 785a67937c37..d1273d7762ef 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/spi/MetaAccessExtensionProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.spi; +package jdk.compiler.graal.core.common.spi; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java index 7ecb1338be8a..682211133374 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/AbstractObjectStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import java.util.AbstractList; import java.util.Objects; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java index 99eba9f3aba1..cfd6e508fa84 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/AbstractPointerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java index 71670f49419e..b89ed4417d40 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ArithmeticOpTable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Add; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Div; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Max; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Min; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Mul; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Rem; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Sub; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMax; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMin; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMulHigh; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Xor; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shl; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shr; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp.UShr; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Abs; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Neg; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Not; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.util.CollectionsUtil; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java index 123b2b4242cb..2cd032221402 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ArithmeticStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import java.nio.ByteBuffer; import java.util.Objects; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/CompressibleConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/CompressibleConstant.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java index ca6043f5eac1..8708c1630b7b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/CompressibleConstant.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java index d9f58d8f1e42..d3553f740c53 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/DataPointerConstant.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.SerializableConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/FloatStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/FloatStamp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/FloatStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/FloatStamp.java index f8d27479e9f8..6b2306802ece 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/FloatStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/FloatStamp.java @@ -22,26 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import static org.graalvm.compiler.core.common.calc.FloatConvert.D2F; -import static org.graalvm.compiler.core.common.calc.FloatConvert.D2I; -import static org.graalvm.compiler.core.common.calc.FloatConvert.D2L; -import static org.graalvm.compiler.core.common.calc.FloatConvert.F2D; -import static org.graalvm.compiler.core.common.calc.FloatConvert.F2I; -import static org.graalvm.compiler.core.common.calc.FloatConvert.F2L; +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 java.nio.ByteBuffer; import java.util.function.DoubleBinaryOperator; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.calc.ReinterpretUtils; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.FloatConvertOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ReinterpretOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp; -import org.graalvm.compiler.debug.GraalError; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; @@ -361,7 +357,7 @@ private static FloatStamp stampForConstant(Constant constant) { return null; } - private static Stamp maybeFoldConstant(UnaryOp op, FloatStamp stamp) { + private static Stamp maybeFoldConstant(ArithmeticOpTable.UnaryOp op, FloatStamp stamp) { if (stamp.isConstant()) { JavaConstant constant = stamp.asConstant(); Constant folded = op.foldConstant(constant); @@ -372,7 +368,7 @@ private static Stamp maybeFoldConstant(UnaryOp op, FloatStamp stamp) { return null; } - private static Stamp maybeFoldConstant(BinaryOp op, FloatStamp stamp1, FloatStamp stamp2) { + private static Stamp maybeFoldConstant(ArithmeticOpTable.BinaryOp op, FloatStamp stamp1, FloatStamp stamp2) { if (stamp1.isConstant() && stamp2.isConstant()) { JavaConstant constant1 = stamp1.asConstant(); JavaConstant constant2 = stamp2.asConstant(); @@ -390,7 +386,7 @@ private static Stamp maybeFoldConstant(BinaryOp op, FloatStamp stamp1, FloatS public static final ArithmeticOpTable OPS = new ArithmeticOpTable( - new UnaryOp.Neg() { + new ArithmeticOpTable.UnaryOp.Neg() { @Override public Constant foldConstant(Constant c) { @@ -420,7 +416,7 @@ protected Stamp foldStampImpl(Stamp s) { }, - new BinaryOp.Add(false, true) { + new ArithmeticOpTable.BinaryOp.Add(false, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -468,7 +464,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Sub(false, false) { + new ArithmeticOpTable.BinaryOp.Sub(false, false) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -516,7 +512,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Mul(false, true) { + new ArithmeticOpTable.BinaryOp.Mul(false, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -568,7 +564,7 @@ public boolean isNeutral(Constant value) { null, - new BinaryOp.Div(false, false) { + new ArithmeticOpTable.BinaryOp.Div(false, false) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -618,7 +614,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Rem(false, false) { + new ArithmeticOpTable.BinaryOp.Rem(false, false) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -653,7 +649,7 @@ protected Stamp foldStampImpl(Stamp s1, Stamp s2) { } }, - new UnaryOp.Not() { + new ArithmeticOpTable.UnaryOp.Not() { @Override public Constant foldConstant(Constant c) { @@ -690,7 +686,7 @@ protected Stamp foldStampImpl(Stamp s) { } }, - new BinaryOp.And(true, true) { + new ArithmeticOpTable.BinaryOp.And(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -742,7 +738,7 @@ public boolean isNeutral(Constant n) { } }, - new BinaryOp.Or(true, true) { + new ArithmeticOpTable.BinaryOp.Or(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -796,7 +792,7 @@ public boolean isNeutral(Constant n) { } }, - new BinaryOp.Xor(true, true) { + new ArithmeticOpTable.BinaryOp.Xor(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -850,7 +846,7 @@ public boolean isNeutral(Constant n) { null, null, null, - new UnaryOp.Abs() { + new ArithmeticOpTable.UnaryOp.Abs() { @Override public Constant foldConstant(Constant c) { @@ -882,7 +878,7 @@ protected Stamp foldStampImpl(Stamp s) { } }, - new UnaryOp.Sqrt() { + new ArithmeticOpTable.UnaryOp.Sqrt() { @Override public Constant foldConstant(Constant c) { @@ -913,7 +909,7 @@ protected Stamp foldStampImpl(Stamp s) { null, null, null, - new BinaryOp.Max(true, true) { + new ArithmeticOpTable.BinaryOp.Max(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -962,7 +958,7 @@ public boolean isNeutral(Constant n) { } }, - new BinaryOp.Min(true, true) { + new ArithmeticOpTable.BinaryOp.Min(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1013,7 +1009,7 @@ public boolean isNeutral(Constant n) { null, // UMax null, // UMin - new ReinterpretOp() { + new ArithmeticOpTable.ReinterpretOp() { @Override public Constant foldConstant(Stamp resultStamp, Constant constant) { @@ -1035,7 +1031,7 @@ public Stamp foldStamp(Stamp resultStamp, Stamp input) { null, // Compress null, // Expand - new FloatConvertOp(F2I) { + new ArithmeticOpTable.FloatConvertOp(F2I) { @Override public Constant foldConstant(Constant c) { @@ -1064,7 +1060,7 @@ protected Stamp foldStampImpl(Stamp stamp) { } }, - new FloatConvertOp(F2L) { + new ArithmeticOpTable.FloatConvertOp(F2L) { @Override public Constant foldConstant(Constant c) { @@ -1093,7 +1089,7 @@ protected Stamp foldStampImpl(Stamp stamp) { } }, - new FloatConvertOp(D2I) { + new ArithmeticOpTable.FloatConvertOp(D2I) { @Override public Constant foldConstant(Constant c) { @@ -1122,7 +1118,7 @@ protected Stamp foldStampImpl(Stamp stamp) { } }, - new FloatConvertOp(D2L) { + new ArithmeticOpTable.FloatConvertOp(D2L) { @Override public Constant foldConstant(Constant c) { @@ -1151,7 +1147,7 @@ protected Stamp foldStampImpl(Stamp stamp) { } }, - new FloatConvertOp(F2D) { + new ArithmeticOpTable.FloatConvertOp(F2D) { @Override public Constant foldConstant(Constant c) { @@ -1170,7 +1166,7 @@ protected Stamp foldStampImpl(Stamp stamp) { } }, - new FloatConvertOp(D2F) { + new ArithmeticOpTable.FloatConvertOp(D2F) { @Override public Constant foldConstant(Constant c) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/IllegalStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IllegalStamp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/IllegalStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IllegalStamp.java index 639dbcb9bb2d..8a9ca1ceb874 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/IllegalStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IllegalStamp.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.core.common.spi.LIRKindTool; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/IntegerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IntegerStamp.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/IntegerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IntegerStamp.java index 7c34bfc34a4b..633e4b0b846d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/IntegerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IntegerStamp.java @@ -22,29 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import static jdk.vm.ci.code.CodeUtil.isPowerOf2; -import static org.graalvm.compiler.core.common.calc.FloatConvert.I2D; -import static org.graalvm.compiler.core.common.calc.FloatConvert.I2F; -import static org.graalvm.compiler.core.common.calc.FloatConvert.L2D; -import static org.graalvm.compiler.core.common.calc.FloatConvert.L2F; +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 java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.nio.ByteBuffer; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.ReinterpretUtils; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.FloatConvertOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ReinterpretOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp; -import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp; -import org.graalvm.compiler.debug.GraalError; +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.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.Constant; @@ -1002,7 +996,7 @@ public static boolean negateCanOverflow(IntegerStamp stamp) { public static final ArithmeticOpTable OPS = new ArithmeticOpTable( - new UnaryOp.Neg() { + new ArithmeticOpTable.UnaryOp.Neg() { @Override public Constant foldConstant(Constant value) { @@ -1030,7 +1024,7 @@ protected Stamp foldStampImpl(Stamp s) { } }, - new BinaryOp.Add(true, true) { + new ArithmeticOpTable.BinaryOp.Add(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1101,7 +1095,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Sub(true, false) { + new ArithmeticOpTable.BinaryOp.Sub(true, false) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1129,7 +1123,7 @@ public Constant getZero(Stamp s) { } }, - new BinaryOp.Mul(true, true) { + new ArithmeticOpTable.BinaryOp.Mul(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1314,7 +1308,7 @@ public boolean isNeutral(Constant value) { * * mulHigh(-1, mulHigh(1, 1)) = mulHigh(-1, 0) = 0 */ - new BinaryOp.MulHigh(false, true) { + new ArithmeticOpTable.BinaryOp.MulHigh(false, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1396,7 +1390,7 @@ private long multiplyHigh(long x, long y, JavaKind javaKind) { * * uMulHigh(-1L, uMulHigh(Long.MAX_VALUE, 4L)) = 0 */ - new BinaryOp.UMulHigh(false, true) { + new ArithmeticOpTable.BinaryOp.UMulHigh(false, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1493,7 +1487,7 @@ private long multiplyHighUnsigned(long x, long y, JavaKind javaKind) { } }, - new BinaryOp.Div(true, false) { + new ArithmeticOpTable.BinaryOp.Div(true, false) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1536,7 +1530,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Rem(false, false) { + new ArithmeticOpTable.BinaryOp.Rem(false, false) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1590,7 +1584,7 @@ protected Stamp foldStampImpl(Stamp stamp1, Stamp stamp2) { } }, - new UnaryOp.Not() { + new ArithmeticOpTable.UnaryOp.Not() { @Override public Constant foldConstant(Constant c) { @@ -1614,7 +1608,7 @@ protected Stamp foldStampImpl(Stamp stamp) { } }, - new BinaryOp.And(true, true) { + new ArithmeticOpTable.BinaryOp.And(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1647,7 +1641,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Or(true, true) { + new ArithmeticOpTable.BinaryOp.Or(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1678,7 +1672,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Xor(true, true) { + new ArithmeticOpTable.BinaryOp.Xor(true, true) { @Override public Constant foldConstant(Constant const1, Constant const2) { @@ -1719,7 +1713,7 @@ public Constant getZero(Stamp s) { } }, - new ShiftOp.Shl() { + new ArithmeticOpTable.ShiftOp.Shl() { @Override public Constant foldConstant(Constant value, int amount) { @@ -1804,7 +1798,7 @@ public int getShiftAmountMask(Stamp s) { } }, - new ShiftOp.Shr() { + new ArithmeticOpTable.ShiftOp.Shr() { @Override public Constant foldConstant(Constant value, int amount) { @@ -1856,7 +1850,7 @@ public int getShiftAmountMask(Stamp s) { } }, - new ShiftOp.UShr() { + new ArithmeticOpTable.ShiftOp.UShr() { @Override public Constant foldConstant(Constant value, int amount) { @@ -1911,7 +1905,7 @@ public int getShiftAmountMask(Stamp s) { } }, - new UnaryOp.Abs() { + new ArithmeticOpTable.UnaryOp.Abs() { @Override public Constant foldConstant(Constant value) { @@ -1941,7 +1935,7 @@ protected Stamp foldStampImpl(Stamp input) { null, - new IntegerConvertOp.ZeroExtend() { + new ArithmeticOpTable.IntegerConvertOp.ZeroExtend() { @Override public Constant foldConstant(int inputBits, int resultBits, Constant c) { @@ -2010,7 +2004,7 @@ public Stamp invertStamp(int inputBits, int resultBits, Stamp outStamp) { } }, - new IntegerConvertOp.SignExtend() { + new ArithmeticOpTable.IntegerConvertOp.SignExtend() { @Override public Constant foldConstant(int inputBits, int resultBits, Constant c) { @@ -2141,7 +2135,7 @@ public Stamp invertStamp(int inputBits, int resultBits, Stamp outStamp) { } }, - new IntegerConvertOp.Narrow() { + new ArithmeticOpTable.IntegerConvertOp.Narrow() { @Override public Constant foldConstant(int inputBits, int resultBits, Constant c) { @@ -2186,7 +2180,7 @@ public Stamp foldStamp(int inputBits, int resultBits, Stamp input) { } }, - new BinaryOp.Max(true, true) { + new ArithmeticOpTable.BinaryOp.Max(true, true) { @Override public Constant foldConstant(Constant a, Constant b) { @@ -2220,7 +2214,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.Min(true, true) { + new ArithmeticOpTable.BinaryOp.Min(true, true) { @Override public Constant foldConstant(Constant a, Constant b) { @@ -2254,7 +2248,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.UMax(true, true) { + new ArithmeticOpTable.BinaryOp.UMax(true, true) { @Override public Constant foldConstant(Constant a, Constant b) { @@ -2291,7 +2285,7 @@ public boolean isNeutral(Constant value) { } }, - new BinaryOp.UMin(true, true) { + new ArithmeticOpTable.BinaryOp.UMin(true, true) { @Override public Constant foldConstant(Constant a, Constant b) { @@ -2329,7 +2323,7 @@ public boolean isNeutral(Constant value) { } }, - new ReinterpretOp() { + new ArithmeticOpTable.ReinterpretOp() { @Override public Constant foldConstant(Stamp resultStamp, Constant constant) { @@ -2348,7 +2342,7 @@ public Stamp foldStamp(Stamp resultStamp, Stamp input) { } }, - new BinaryOp.Compress(false, false) { + new ArithmeticOpTable.BinaryOp.Compress(false, false) { private static final long INT_MASK = CodeUtil.mask(32); private static final long LONG_MASK = CodeUtil.mask(64); @@ -2416,7 +2410,7 @@ protected Stamp foldStampImpl(Stamp a, Stamp b) { } }, - new BinaryOp.Expand(false, false) { + new ArithmeticOpTable.BinaryOp.Expand(false, false) { private static int integerExpand(int i, int mask) { try { @@ -2456,7 +2450,7 @@ public Stamp foldStampImpl(Stamp a, Stamp b) { } }, - new FloatConvertOp(I2F) { + new ArithmeticOpTable.FloatConvertOp(I2F) { @Override public Constant foldConstant(Constant c) { @@ -2477,7 +2471,7 @@ protected Stamp foldStampImpl(Stamp input) { } }, - new FloatConvertOp(L2F) { + new ArithmeticOpTable.FloatConvertOp(L2F) { @Override public Constant foldConstant(Constant c) { @@ -2498,7 +2492,7 @@ protected Stamp foldStampImpl(Stamp input) { } }, - new FloatConvertOp(I2D) { + new ArithmeticOpTable.FloatConvertOp(I2D) { @Override public Constant foldConstant(Constant c) { @@ -2519,7 +2513,7 @@ protected Stamp foldStampImpl(Stamp input) { } }, - new FloatConvertOp(L2D) { + new ArithmeticOpTable.FloatConvertOp(L2D) { @Override public Constant foldConstant(Constant c) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ObjectStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ObjectStamp.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ObjectStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ObjectStamp.java index 30e23e0a8c57..24021ae584d1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/ObjectStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ObjectStamp.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.core.common.spi.LIRKindTool; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java index 022767e0e675..7bf99b99f176 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/PrimitiveStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java index d8c3858d3df4..eda4daf77a78 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/RawPointerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.core.common.spi.LIRKindTool; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.MemoryAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/Stamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/Stamp.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/Stamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/Stamp.java index ba9672d806ef..c93c6f0fcaaa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/Stamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/Stamp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup.SpeculationContextObject; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/StampFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampFactory.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/StampFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampFactory.java index 8da3ce14210c..b888f8423d7e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/StampFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampFactory.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import static jdk.vm.ci.code.CodeUtil.signExtend; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.NumUtil; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/StampPair.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampPair.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/StampPair.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampPair.java index e5d950d9c1c8..37be3903e872 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/StampPair.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampPair.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import java.util.Objects; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/SymbolicJVMCIReference.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/SymbolicJVMCIReference.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java index deeefa483a13..6ce8264d8d2c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/SymbolicJVMCIReference.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/TypeReference.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypeReference.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/TypeReference.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypeReference.java index 33306c533d06..e93432872188 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/TypeReference.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypeReference.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/TypedConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypedConstant.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/TypedConstant.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypedConstant.java index a8304677ce1e..cb010141a047 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/TypedConstant.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypedConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; import jdk.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/VoidStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/VoidStamp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/VoidStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/VoidStamp.java index 55f0639cba0b..9f4cb5b1463b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/type/VoidStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/VoidStamp.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.type; +package jdk.compiler.graal.core.common.type; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.core.common.spi.LIRKindTool; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/AbstractTypeReader.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/AbstractTypeReader.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java index 9f138ca51ddc..edb42e8d15da 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/AbstractTypeReader.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; public abstract class AbstractTypeReader implements TypeReader { @Override diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/BitMap2D.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/BitMap2D.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/BitMap2D.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/BitMap2D.java index 07791ee5c831..ee7b8014a1f5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/BitMap2D.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/BitMap2D.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.BitSet; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java index d72de7246154..43b82f65f5d9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/CompilationAlarm.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.Arrays; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Graph; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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; /** * Utility class that allows the compiler to monitor compilations that take a very long time. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/EventCounter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/EventCounter.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/EventCounter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/EventCounter.java index 9a9a55fe16f8..ccd1e840b366 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/EventCounter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/EventCounter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; /** * Interface representing a counter that can overflow to trigger certain events. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/FieldKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FieldKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/FieldKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FieldKey.java index 4e1b8dfe38c6..545ba4b4c950 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/FieldKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FieldKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java index 255ec6812acd..4faba0c78690 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/FrequencyEncoder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/IntList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/IntList.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/IntList.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/IntList.java index f7251f7244c8..9157b7c8716a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/IntList.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/IntList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/MethodKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/MethodKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/MethodKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/MethodKey.java index fab59c777e1b..e7549bd23a09 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/MethodKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/MethodKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/PhasePlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/PhasePlan.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/PhasePlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/PhasePlan.java index c984907ff9c1..a400f15cb775 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/PhasePlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/PhasePlan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.Formatter; import java.util.HashMap; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/ReversedList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/ReversedList.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/ReversedList.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/ReversedList.java index ef54e05fb733..046e9f51963e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/ReversedList.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/ReversedList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.AbstractList; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeConversion.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeConversion.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeConversion.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeConversion.java index e096e12c72ba..ef1a187947dc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeConversion.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeConversion.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeReader.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeReader.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeReader.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeReader.java index 8bc2c9954a5f..9ca8910cbeb7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeReader.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeReader.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeWriter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeWriter.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeWriter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeWriter.java index 5e9a31fafb57..22ad7b9df25c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/TypeWriter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeWriter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java index c862ab2a6220..a4eee8e10386 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeReader.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; -import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java index bcb42968c32a..bb1f108f1aa4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsafeArrayTypeWriter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; -import static org.graalvm.compiler.core.common.util.TypeConversion.asS1; -import static org.graalvm.compiler.core.common.util.TypeConversion.asS2; -import static org.graalvm.compiler.core.common.util.TypeConversion.asS4; -import static org.graalvm.compiler.core.common.util.TypeConversion.asU1; -import static org.graalvm.compiler.core.common.util.TypeConversion.asU2; -import static org.graalvm.compiler.core.common.util.TypeConversion.asU4; -import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; +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 java.nio.ByteBuffer; -import org.graalvm.compiler.core.common.calc.UnsignedMath; +import jdk.compiler.graal.core.common.calc.UnsignedMath; import sun.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsignedLong.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsignedLong.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsignedLong.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsignedLong.java index 4416bcf08942..4a05d040008c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/UnsignedLong.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsignedLong.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; public final class UnsignedLong { private final long value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/Util.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/Util.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/Util.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/Util.java index 5cd64edba0cc..fcb67e80e76f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/common/util/Util.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/Util.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.common.util; +package jdk.compiler.graal.core.common.util; import java.util.List; -import org.graalvm.compiler.debug.TTY; +import jdk.compiler.graal.debug.TTY; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/doc-files/CompilationFailureActionHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/doc-files/CompilationFailureActionHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java index 594c8b3bc856..f31c0adf3aee 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/BytecodeParserTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.core.gen; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java index 0b055beb781c..d26321d6a405 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/DebugInfoBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java @@ -22,33 +22,33 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.ImplicitLIRFrameState; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.NodeValueMap; -import org.graalvm.compiler.nodes.spi.NodeWithState; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.nodes.virtual.EscapeObjectState; -import org.graalvm.compiler.nodes.virtual.MaterializedObjectState; -import org.graalvm.compiler.nodes.virtual.VirtualBoxingNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectState; +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.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/InstructionPrinter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/InstructionPrinter.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/InstructionPrinter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/InstructionPrinter.java index d0e4a995194f..957bd4156258 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/InstructionPrinter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/InstructionPrinter.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.core.gen; -import static org.graalvm.compiler.core.gen.InstructionPrinter.InstructionLineColumn.BCI; -import static org.graalvm.compiler.core.gen.InstructionPrinter.InstructionLineColumn.INSTRUCTION; -import static org.graalvm.compiler.core.gen.InstructionPrinter.InstructionLineColumn.USE; -import static org.graalvm.compiler.core.gen.InstructionPrinter.InstructionLineColumn.VALUE; +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 org.graalvm.compiler.debug.LogStream; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.StateSplit; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.debug.LogStream; +import jdk.compiler.graal.nodeinfo.Verbosity; +import jdk.compiler.graal.nodes.StateSplit; +import jdk.compiler.graal.nodes.ValueNode; /** * A utility for {@linkplain #printInstruction(ValueNode) printing} a node as an expression or diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java index fb24abb13033..93faeec78a0b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/LIRCompilerBackend.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java @@ -22,45 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.core.gen; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.LIRGenerationPhase; -import org.graalvm.compiler.core.LIRGenerationPhase.LIRGenerationContext; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.alloc.LinearScanOrder; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder; -import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder.ComputationTime; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.lir.ComputeCodeEmissionOrder; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.alloc.OutOfRegistersException; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.asm.EntryPointDecorator; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import org.graalvm.compiler.nodes.GraphState.StageFlag; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.code.RegisterConfig; import jdk.vm.ci.code.TargetDescription; @@ -158,7 +156,7 @@ private static LIRGenerationResult emitLIR0(Backend backend, NodeLIRBuilderTool nodeLirGen = lirBackend.newNodeLIRBuilder(graph, lirGen); // LIR generation - LIRGenerationContext context = new LIRGenerationContext(lirGen, nodeLirGen, graph, schedule); + LIRGenerationPhase.LIRGenerationContext context = new LIRGenerationPhase.LIRGenerationContext(lirGen, nodeLirGen, graph, schedule); new LIRGenerationPhase().apply(backend.getTarget(), lirGenRes, context); if (entryPointDecorator != null) { @@ -215,7 +213,7 @@ public static void emitCode(Backend backend, CompilationResultBuilderFactory factory, EntryPointDecorator entryPointDecorator) { DebugContext debug = lirGenRes.getLIR().getDebug(); - try (DebugCloseable a = EmitCode.start(debug); CompilerPhaseScope cps = debug.enterCompilerPhase("Emit code");) { + try (DebugCloseable a = EmitCode.start(debug); DebugContext.CompilerPhaseScope cps = debug.enterCompilerPhase("Emit code");) { LIRGenerationProvider lirBackend = (LIRGenerationProvider) backend; FrameMap frameMap = lirGenRes.getFrameMap(); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/LIRGenerationProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/LIRGenerationProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java index db2de5f6ec64..53c1df934d85 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/LIRGenerationProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.core.gen; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.asm.EntryPointDecorator; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java index 11cfc61aec19..c65ae248c091 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/NodeLIRBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java @@ -22,97 +22,97 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions.MatchExpressions; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpeculativeExecutionBarriers; -import static org.graalvm.compiler.core.match.ComplexMatchValue.INTERIOR_MATCH; -import static org.graalvm.compiler.debug.DebugOptions.LogVerbose; -import static org.graalvm.compiler.lir.LIR.verifyBlock; +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 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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.UnmodifiableMapCursor; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.match.ComplexMatchValue; -import org.graalvm.compiler.core.match.MatchPattern; -import org.graalvm.compiler.core.match.MatchRuleRegistry; -import org.graalvm.compiler.core.match.MatchStatement; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.GraalGraphError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.lir.FullInfopointOp; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.StandardOp.JumpOp; -import org.graalvm.compiler.lir.StandardOp.LabelOp; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.debug.LIRGenerationDebugContext; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGenerator.Options; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.BlockScope; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractEndNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.DirectCallTargetNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.ImplicitNullCheckNode; -import org.graalvm.compiler.nodes.IndirectCallTargetNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.LogicConstantNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.LoopEndNode; -import org.graalvm.compiler.nodes.LoweredCallTargetNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.WithExceptionNode; -import org.graalvm.compiler.nodes.calc.CompareNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IntegerTestNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.extended.ForeignCall; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.nodes.extended.OpaqueLogicNode; -import org.graalvm.compiler.nodes.extended.SwitchNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.nodes.spi.NodeValueMap; -import org.graalvm.compiler.nodes.spi.NodeWithState; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.BailoutException; import jdk.vm.ci.code.CallingConvention; @@ -464,7 +464,7 @@ protected void matchComplexExpressions(HIRBlock block, StructuredGraph.ScheduleR DebugContext debug = gen.getResult().getLIR().getDebug(); try (DebugContext.Scope s = debug.scope("MatchComplexExpressions")) { List nodes = schedule.getBlockToNodesMap().get(block); - if (LogVerbose.getValue(nodeOperands.graph().getOptions())) { + if (DebugOptions.LogVerbose.getValue(nodeOperands.graph().getOptions())) { int i = 0; for (Node node : nodes) { debug.log("%d: (%s) %1S", i++, node.getUsageCount(), node); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/NodeMatchRules.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeMatchRules.java similarity index 71% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/NodeMatchRules.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeMatchRules.java index c1fc1a98bcf9..7740f0c13c14 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/NodeMatchRules.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeMatchRules.java @@ -22,51 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.gen; +package jdk.compiler.graal.core.gen; -import org.graalvm.compiler.core.match.MatchableNode; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.AndNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.calc.FloatEqualsNode; -import org.graalvm.compiler.nodes.calc.FloatLessThanNode; -import org.graalvm.compiler.nodes.calc.IntegerBelowNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.calc.IntegerLessThanNode; -import org.graalvm.compiler.nodes.calc.IntegerTestNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.MulNode; -import org.graalvm.compiler.nodes.calc.NarrowNode; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.calc.NotNode; -import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; -import org.graalvm.compiler.nodes.calc.OrNode; -import org.graalvm.compiler.nodes.calc.PointerEqualsNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.nodes.calc.RightShiftNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.SqrtNode; -import org.graalvm.compiler.nodes.calc.SubNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; -import org.graalvm.compiler.nodes.calc.XorNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode; -import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.SideEffectFreeWriteNode; -import org.graalvm.compiler.nodes.memory.WriteNode; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/package-info.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/package-info.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/package-info.java index 68dca8761b28..c084f3a6d6e9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/gen/package-info.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.core.gen; +package jdk.compiler.graal.core.gen; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/ComplexMatchResult.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchResult.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/ComplexMatchResult.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchResult.java index 95146d3e77e0..907bd62f7336 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/ComplexMatchResult.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchResult.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; +import jdk.compiler.graal.core.gen.NodeLIRBuilder; import jdk.vm.ci.meta.Value; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; - /** * A closure that can be evaluated to produce the LIR for some complex match. Using a closure allows * normal evaluation in NodeLIRBuilder for all the simple nodes with the complex nodes evaluated at diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/ComplexMatchValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchValue.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/ComplexMatchValue.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchValue.java index 97f877ab43ca..bac32dc4f616 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/ComplexMatchValue.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchValue.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; +import jdk.compiler.graal.core.gen.NodeLIRBuilder; +import jdk.compiler.graal.core.common.LIRKind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchContext.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchContext.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchContext.java index a8d221f33570..7f532d0036b0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchContext.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchContext.java @@ -22,31 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; - -import static org.graalvm.compiler.debug.DebugOptions.LogVerbose; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.core.match.MatchPattern.Result; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.VirtualState; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; +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; /** * Container for state captured during a match. @@ -171,7 +169,7 @@ public MatchStatement getRule() { return rule; } - public Result captureNamedValue(String name, Class type, Node value) { + public MatchPattern.Result captureNamedValue(String name, Class type, Node value) { if (namedNodes == null) { namedNodes = EconomicMap.create(Equivalence.DEFAULT); } @@ -179,18 +177,18 @@ public Result captureNamedValue(String name, Class type, Node va if (current == null) { current = new NamedNode(type, value); namedNodes.put(name, current); - return Result.OK; + return MatchPattern.Result.OK; } else { if (current.value != value || current.type != type) { - return Result.namedValueMismatch(value, rule.getPattern()); + return MatchPattern.Result.namedValueMismatch(value, rule.getPattern()); } - return Result.OK; + return MatchPattern.Result.OK; } } - public Result validate() { - Result result = findEarlyPosition(); - if (result != Result.OK) { + public MatchPattern.Result validate() { + MatchPattern.Result result = findEarlyPosition(); + if (result != MatchPattern.Result.OK) { return result; } findLatePosition(); @@ -198,7 +196,7 @@ public Result validate() { return verifyInputs(); } - private Result findEarlyPosition() { + private MatchPattern.Result findEarlyPosition() { int startIndexSideEffect = -1; int endIndexSideEffect = -1; final NodeMap nodeToBlockMap = schedule.getNodeToBlockMap(); @@ -217,7 +215,7 @@ private Result findEarlyPosition() { endIndexSideEffect = Math.max(endIndexSideEffect, index); } else { logFailedMatch("nodes affected by side effects in different blocks %s", cn.node); - return Result.notInBlock(cn.node, rule.getPattern()); + return MatchPattern.Result.notInBlock(cn.node, rule.getPattern()); } } } @@ -229,7 +227,7 @@ private Result findEarlyPosition() { Node node = nodes.get(i); if (!sideEffectFree(node) && !consumed.contains(node)) { logFailedMatch("unexpected side effect %s", node); - return Result.notSafe(node, rule.getPattern()); + return MatchPattern.Result.notSafe(node, rule.getPattern()); } } // early position is at the node affected by side effects the closest to the root @@ -239,7 +237,7 @@ private Result findEarlyPosition() { emitBlock = nodeToBlockMap.get(root); emitIndex = rootIndex; } - return Result.OK; + return MatchPattern.Result.OK; } private static boolean sideEffectFree(Node node) { @@ -271,12 +269,12 @@ private void findLatePosition() { } } - private Result verifyInputs() { + private MatchPattern.Result verifyInputs() { DebugContext debug = root.getDebug(); if (emitBlock != rootBlock) { assert consumed.find(root).ignoresSideEffects; - Result result = verifyInputsDifferentBlock(root); - if (result == Result.OK) { + MatchPattern.Result result = verifyInputsDifferentBlock(root); + if (result == MatchPattern.Result.OK) { MatchContextSuccessDifferentBlocks.increment(debug); } return result; @@ -296,19 +294,19 @@ private Result verifyInputs() { if (nodes.get(j) == in) { logFailedMatch("Earliest position in block is too late %s", in); assert consumed.find(root).ignoresSideEffects; - assert verifyInputsDifferentBlock(root) != Result.OK; - return Result.tooLate(node, rule.getPattern()); + assert verifyInputsDifferentBlock(root) != MatchPattern.Result.OK; + return MatchPattern.Result.tooLate(node, rule.getPattern()); } } } } } } - assert verifyInputsDifferentBlock(root) == Result.OK; - return Result.OK; + assert verifyInputsDifferentBlock(root) == MatchPattern.Result.OK; + return MatchPattern.Result.OK; } - private Result verifyInputsDifferentBlock(Node node) { + private MatchPattern.Result verifyInputsDifferentBlock(Node node) { // Is there an input that's not part of the match that's after the emit position? for (Node in : node.inputs()) { if (in instanceof PhiNode) { @@ -325,19 +323,19 @@ private Result verifyInputsDifferentBlock(Node node) { ConsumedNode cn = consumed.find(in); if (cn == null) { logFailedMatch("Earliest position in block is too late %s", in); - return Result.tooLate(node, rule.getPattern()); + return MatchPattern.Result.tooLate(node, rule.getPattern()); } assert cn.ignoresSideEffects; - Result res = verifyInputsDifferentBlock(in); - if (res != Result.OK) { + MatchPattern.Result res = verifyInputsDifferentBlock(in); + if (res != MatchPattern.Result.OK) { return res; } } - return Result.OK; + return MatchPattern.Result.OK; } private void logFailedMatch(String s, Node node) { - if (LogVerbose.getValue(root.getOptions())) { + if (DebugOptions.LogVerbose.getValue(root.getOptions())) { DebugContext debug = root.getDebug(); debug.log(s, node); int startIndex = emitIndex; @@ -406,18 +404,18 @@ private void setResult(ConsumedNode consumedNode) { * * @return Result.OK if the node can be safely consumed. */ - public Result consume(Node node, boolean ignoresSideEffects, boolean atRoot, boolean singleUser) { + public MatchPattern.Result consume(Node node, boolean ignoresSideEffects, boolean atRoot, boolean singleUser) { if (atRoot) { consumed.add(node, ignoresSideEffects, singleUser); - return Result.OK; + return MatchPattern.Result.OK; } if (builder.hasOperand(node)) { - return Result.alreadyUsed(node, rule.getPattern()); + return MatchPattern.Result.alreadyUsed(node, rule.getPattern()); } consumed.add(node, ignoresSideEffects, singleUser); - return Result.OK; + return MatchPattern.Result.OK; } /** diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchGenerator.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchGenerator.java index e2378066fa96..7a381f99dc01 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchGenerator.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; -import org.graalvm.compiler.core.gen.NodeMatchRules; +import jdk.compiler.graal.core.gen.NodeMatchRules; /** * Code generator for complex match patterns. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchPattern.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchPattern.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchPattern.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchPattern.java index 121a1732e88e..c98895739612 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchPattern.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchPattern.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; - -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.Position; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.memory.OnHeapMemoryAccess; +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; /** * A simple recursive pattern matcher for a DAG of nodes. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRule.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRule.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRule.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRule.java index d4d9b2e7eaf6..aa1b511e7a97 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRule.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRule.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.ConstantNode; +import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java index cbf68137fc73..65b57e750bab 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRuleRegistry.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; -import static org.graalvm.compiler.debug.DebugOptions.LogVerbose; +import static jdk.compiler.graal.debug.DebugOptions.LogVerbose; import java.util.ArrayList; import java.util.List; @@ -32,22 +32,21 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; import org.graalvm.collections.MapCursor; -import org.graalvm.compiler.core.gen.NodeMatchRules; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Edges; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.Position; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +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; public class MatchRuleRegistry { /** - * Convert a list of field names into {@link org.graalvm.compiler.graph.Position} objects that - * can be used to read them during a match. The names should already have been confirmed to - * exist in the type. + * Convert a list of field names into {@link Position} objects that can be used to read them + * during a match. The names should already have been confirmed to exist in the type. * * @param nodeClass * @param names diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRules.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRules.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRules.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRules.java index a3d17d268d48..c341664c3f7d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchRules.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRules.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchStatement.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatement.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchStatement.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatement.java index 17fdcb85b757..1b9c21c812e2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchStatement.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatement.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; -import static org.graalvm.compiler.debug.DebugOptions.LogVerbose; +import static jdk.compiler.graal.debug.DebugOptions.LogVerbose; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.core.match.MatchPattern.MatchResultCode; -import org.graalvm.compiler.core.match.MatchPattern.Result; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.GraalGraphError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodeinfo.Verbosity; +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.vm.ci.meta.Value; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.cfg.HIRBlock; +import jdk.compiler.graal.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.cfg.HIRBlock; /** * A named {@link MatchPattern} along with a {@link MatchGenerator} that can be evaluated to replace diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchStatementSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatementSet.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchStatementSet.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatementSet.java index e9c16ceff314..71f05994ed9e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchStatementSet.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatementSet.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; import java.util.List; -import org.graalvm.compiler.core.gen.NodeLIRBuilder; -import org.graalvm.compiler.core.gen.NodeMatchRules; +import jdk.compiler.graal.core.gen.NodeLIRBuilder; +import jdk.compiler.graal.core.gen.NodeMatchRules; public interface MatchStatementSet { /** diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchableNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNode.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchableNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNode.java index 23ec8d98e062..5c41dfe802aa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchableNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.nodes.ValueNode; /** * Describes the properties of a node for use when building a {@link MatchPattern}. These diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchableNodes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNodes.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchableNodes.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNodes.java index dbed70b0a668..ce2efa309337 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/match/MatchableNodes.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNodes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.match; +package jdk.compiler.graal.core.match; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/package-info.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/package-info.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/package-info.java index 6e630ce8243b..2f45582e4179 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/package-info.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/package-info.java @@ -25,6 +25,6 @@ /** * The top-level package in Graal containing the main compiler class - * {@link org.graalvm.compiler.core.GraalCompiler}. + * {@link jdk.compiler.graal.core.GraalCompiler}. */ -package org.graalvm.compiler.core; +package jdk.compiler.graal.core; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/BaseTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/BaseTier.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/BaseTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/BaseTier.java index 6452ec43dc87..02611f524c0c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/BaseTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/BaseTier.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.loop.LoopPolicies; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.serviceprovider.GraalServices; +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; public class BaseTier extends PhaseSuite { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CEOptimization.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CEOptimization.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java index 45a874e79d25..caa9ef92f7c7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CEOptimization.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java @@ -22,37 +22,38 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.loop.phases.LoopPartialUnrollPhase; -import org.graalvm.compiler.loop.phases.LoopPeelingPhase; -import org.graalvm.compiler.loop.phases.LoopPredicationPhase; -import org.graalvm.compiler.loop.phases.LoopSafepointEliminationPhase; -import org.graalvm.compiler.loop.phases.LoopUnswitchingPhase; -import org.graalvm.compiler.loop.phases.SpeculativeGuardMovementPhase; -import org.graalvm.compiler.nodes.memory.MemoryMap; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.nodes.spi.Simplifiable; -import org.graalvm.compiler.nodes.spi.SimplifierTool; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.BoxNodeOptimizationPhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.LockEliminationPhase; -import org.graalvm.compiler.phases.common.ReassociationPhase; -import org.graalvm.compiler.phases.common.UseTrappingNullChecksPhase; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase; -import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase; +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; /** * This class enumerates the most important platform-independent optimizations in the GraalVM CE @@ -73,7 +74,7 @@ public enum CEOptimization { * * @see Canonicalizable#canonical(CanonicalizerTool) * @see Simplifiable#simplify(SimplifierTool) - * @see org.graalvm.compiler.graph.Node.ValueNumberable + * @see Node.ValueNumberable * */ Canonicalization(null, CanonicalizerPhase.class), diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CommunityCompilerConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CommunityCompilerConfiguration.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java index 46ae61bfe186..dab2ef8a44b5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CommunityCompilerConfiguration.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.lir.phases.AllocationStage; -import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; -import org.graalvm.compiler.lir.phases.FinalCodeAnalysisStage; -import org.graalvm.compiler.lir.phases.LIRPhaseSuite; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationStage; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationStage; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java similarity index 70% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java index 8c6cc20cde80..5b3cc1cb3bbc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyCompilerConfiguration.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.lir.phases.EconomyAllocationStage; -import org.graalvm.compiler.lir.phases.EconomyFinalCodeAnalysisStage; -import org.graalvm.compiler.lir.phases.EconomyPostAllocationOptimizationStage; -import org.graalvm.compiler.lir.phases.EconomyPreAllocationOptimizationStage; -import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext; -import org.graalvm.compiler.lir.phases.LIRPhaseSuite; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyHighTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyHighTier.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyHighTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyHighTier.java index 1e250105c20e..ab2c899c5ad0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyHighTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyHighTier.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; +import jdk.compiler.graal.phases.common.CanonicalizerPhase; +import jdk.compiler.graal.phases.common.HighTierLoweringPhase; +import jdk.compiler.graal.phases.tiers.HighTierContext; public class EconomyHighTier extends BaseTier { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyLowTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyLowTier.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyLowTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyLowTier.java index 39112896f92c..b68fa2bd8092 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyLowTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyLowTier.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.phases.PlaceholderPhase; -import org.graalvm.compiler.phases.common.AddressLoweringPhase; -import org.graalvm.compiler.phases.common.BarrierSetVerificationPhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.ExpandLogicPhase; -import org.graalvm.compiler.phases.common.LowTierLoweringPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.tiers.LowTierContext; +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; public class EconomyLowTier extends BaseTier { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyMidTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyMidTier.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyMidTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyMidTier.java index 3b5c8454b248..b701d902d7b9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/EconomyMidTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyMidTier.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; +package jdk.compiler.graal.core.phases; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.common.RemoveValueProxyPhase; -import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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; public class EconomyMidTier extends BaseTier { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/HighTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/HighTier.java similarity index 56% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/HighTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/HighTier.java index b7a9a6351dbe..adee9644fde2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/HighTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/HighTier.java @@ -22,40 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; - -import static org.graalvm.compiler.core.common.GraalOptions.ConditionalElimination; -import static org.graalvm.compiler.core.common.GraalOptions.EarlyGVN; -import static org.graalvm.compiler.core.common.GraalOptions.LoopPeeling; -import static org.graalvm.compiler.core.common.GraalOptions.LoopUnswitch; -import static org.graalvm.compiler.core.common.GraalOptions.OptConvertDeoptsToGuards; -import static org.graalvm.compiler.core.common.GraalOptions.OptReadElimination; -import static org.graalvm.compiler.core.common.GraalOptions.PartialEscapeAnalysis; -import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional; - -import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.loop.phases.LoopPeelingPhase; -import org.graalvm.compiler.loop.phases.LoopUnswitchingPhase; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.loop.LoopPolicies; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.BoxNodeIdentityPhase; -import org.graalvm.compiler.phases.common.BoxNodeOptimizationPhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.DisableOverflownCountedLoopsPhase; -import org.graalvm.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.inlining.InliningPhase; -import org.graalvm.compiler.phases.common.inlining.policy.GreedyInliningPolicy; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.virtual.phases.ea.FinalPartialEscapePhase; -import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase; +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; public class HighTier extends BaseTier { @@ -79,26 +73,26 @@ public HighTier(OptionValues options) { appendPhase(new DisableOverflownCountedLoopsPhase()); - if (OptConvertDeoptsToGuards.getValue(options)) { + if (GraalOptions.OptConvertDeoptsToGuards.getValue(options)) { appendPhase(new ConvertDeoptimizeToGuardPhase(canonicalizer)); } - if (ConditionalElimination.getValue(options)) { + if (GraalOptions.ConditionalElimination.getValue(options)) { appendPhase(new IterativeConditionalEliminationPhase(canonicalizer, false)); } - if (EarlyGVN.getValue(options)) { + if (GraalOptions.EarlyGVN.getValue(options)) { appendPhase(new DominatorBasedGlobalValueNumberingPhase(canonicalizer)); } LoopPolicies loopPolicies = createLoopPolicies(options); appendPhase(new LoopFullUnrollPhase(canonicalizer, loopPolicies)); - if (LoopPeeling.getValue(options)) { + if (GraalOptions.LoopPeeling.getValue(options)) { appendPhase(new LoopPeelingPhase(loopPolicies, canonicalizer)); } - if (LoopUnswitch.getValue(options)) { + if (GraalOptions.LoopUnswitch.getValue(options)) { appendPhase(new LoopUnswitchingPhase(loopPolicies, canonicalizer)); } @@ -106,11 +100,11 @@ public HighTier(OptionValues options) { // PartialEscapePhase and BoxNodeOptimizationPhase). appendPhase(new BoxNodeIdentityPhase()); - if (PartialEscapeAnalysis.getValue(options)) { + if (GraalOptions.PartialEscapeAnalysis.getValue(options)) { appendPhase(new FinalPartialEscapePhase(true, canonicalizer, null, options)); } - if (OptReadElimination.getValue(options)) { + if (GraalOptions.OptReadElimination.getValue(options)) { appendPhase(new ReadEliminationPhase(canonicalizer)); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/LowTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/LowTier.java similarity index 72% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/LowTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/LowTier.java index 8cdf06d6ece1..853d8206582e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/LowTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/LowTier.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; - -import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required; - -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PlaceholderPhase; -import org.graalvm.compiler.phases.common.AddressLoweringPhase; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.ExpandLogicPhase; -import org.graalvm.compiler.phases.common.FinalCanonicalizerPhase; -import org.graalvm.compiler.phases.common.FixReadsPhase; -import org.graalvm.compiler.phases.common.LowTierLoweringPhase; -import org.graalvm.compiler.phases.common.OptimizeExtendsPhase; -import org.graalvm.compiler.phases.common.ProfileCompiledMethodsPhase; -import org.graalvm.compiler.phases.common.PropagateDeoptimizeProbabilityPhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy; -import org.graalvm.compiler.phases.tiers.LowTierContext; +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; public class LowTier extends BaseTier { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/MidTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/MidTier.java similarity index 50% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/MidTier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/MidTier.java index 6950f6290285..78a3f2d45244 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/MidTier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/MidTier.java @@ -22,45 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases; - -import static org.graalvm.compiler.core.common.GraalOptions.ConditionalElimination; -import static org.graalvm.compiler.core.common.GraalOptions.LoopPredication; -import static org.graalvm.compiler.core.common.GraalOptions.OptDeoptimizationGrouping; -import static org.graalvm.compiler.core.common.GraalOptions.OptFloatingReads; -import static org.graalvm.compiler.core.common.GraalOptions.PartialUnroll; -import static org.graalvm.compiler.core.common.GraalOptions.ReassociateExpressions; -import static org.graalvm.compiler.core.common.GraalOptions.SpeculativeGuardMovement; -import static org.graalvm.compiler.core.common.GraalOptions.VerifyHeapAtReturn; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.GuardTargets; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.NonDeoptGuardTargets; -import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers; - -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.loop.phases.LoopFullUnrollPhase; -import org.graalvm.compiler.loop.phases.LoopPartialUnrollPhase; -import org.graalvm.compiler.loop.phases.LoopPredicationPhase; -import org.graalvm.compiler.loop.phases.LoopSafepointEliminationPhase; -import org.graalvm.compiler.loop.phases.SpeculativeGuardMovementPhase; -import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies; -import org.graalvm.compiler.nodes.loop.LoopPolicies; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase; -import org.graalvm.compiler.phases.common.FloatingReadPhase; -import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase; -import org.graalvm.compiler.phases.common.GuardLoweringPhase; -import org.graalvm.compiler.phases.common.InsertGuardFencesPhase; -import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase; -import org.graalvm.compiler.phases.common.LockEliminationPhase; -import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase; -import org.graalvm.compiler.phases.common.MidTierLoweringPhase; -import org.graalvm.compiler.phases.common.OptimizeDivPhase; -import org.graalvm.compiler.phases.common.ReassociationPhase; -import org.graalvm.compiler.phases.common.RemoveValueProxyPhase; -import org.graalvm.compiler.phases.common.VerifyHeapAtReturnPhase; -import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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; public class MidTier extends BaseTier { @@ -70,31 +59,32 @@ public MidTier(OptionValues options) { appendPhase(new LockEliminationPhase()); - if (OptFloatingReads.getValue(options)) { + if (GraalOptions.OptFloatingReads.getValue(options)) { appendPhase(new FloatingReadPhase(canonicalizer)); } - if (ConditionalElimination.getValue(options)) { + if (GraalOptions.ConditionalElimination.getValue(options)) { appendPhase(new IterativeConditionalEliminationPhase(canonicalizer, true)); } - if (LoopPredication.getValue(options) && !SpeculativeGuardMovement.getValue(options)) { + if (GraalOptions.LoopPredication.getValue(options) && !GraalOptions.SpeculativeGuardMovement.getValue(options)) { appendPhase(new LoopPredicationPhase(canonicalizer)); } appendPhase(new LoopSafepointEliminationPhase()); - if (SpeculativeGuardMovement.getValue(options)) { + if (GraalOptions.SpeculativeGuardMovement.getValue(options)) { appendPhase(new SpeculativeGuardMovementPhase(canonicalizer)); } appendPhase(new GuardLoweringPhase()); - if (SpectrePHTBarriers.getValue(options) == GuardTargets || SpectrePHTBarriers.getValue(options) == NonDeoptGuardTargets) { + if (SpectrePHTMitigations.Options.SpectrePHTBarriers.getValue(options) == SpectrePHTMitigations.GuardTargets || + SpectrePHTMitigations.Options.SpectrePHTBarriers.getValue(options) == SpectrePHTMitigations.NonDeoptGuardTargets) { appendPhase(new InsertGuardFencesPhase()); } - if (VerifyHeapAtReturn.getValue(options)) { + if (GraalOptions.VerifyHeapAtReturn.getValue(options)) { appendPhase(new VerifyHeapAtReturnPhase()); } @@ -113,16 +103,16 @@ public MidTier(OptionValues options) { appendPhase(new FrameStateAssignmentPhase()); - if (PartialUnroll.getValue(options)) { + if (GraalOptions.PartialUnroll.getValue(options)) { LoopPolicies loopPolicies = createLoopPolicies(options); appendPhase(new LoopPartialUnrollPhase(loopPolicies, canonicalizer)); } - if (ReassociateExpressions.getValue(options)) { + if (GraalOptions.ReassociateExpressions.getValue(options)) { appendPhase(new ReassociationPhase(canonicalizer)); } - if (OptDeoptimizationGrouping.getValue(options)) { + if (GraalOptions.OptDeoptimizationGrouping.getValue(options)) { appendPhase(new DeoptimizationGroupingPhase()); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/AbstractCompilationPlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/AbstractCompilationPlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java index 672b5e1859d3..a8add0a9fd1f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/AbstractCompilationPlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.util.Optional; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.GraphState.MandatoryStages; -import org.graalvm.compiler.nodes.GraphState.StageFlag; -import org.graalvm.compiler.phases.BasePhase.NotApplicable; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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; /** * Compilation plan that represents a specific ordering of phases. These phases are grouped into diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/AbstractTierPlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/AbstractTierPlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java index a3071e9f0501..7a1069ab58a5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/AbstractTierPlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.core.phases.fuzzing.AbstractCompilationPlan.PrintingUtils; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; +import jdk.compiler.graal.nodes.GraphState; +import jdk.compiler.graal.phases.BasePhase; +import jdk.compiler.graal.phases.PhaseSuite; /** * Plan that represents a specific ordering of phases for a tier. @@ -134,7 +133,7 @@ protected String getTierName() { @Override public String toString() { - return String.format("%s %s", getTierName(), PrintingUtils.indent(getPhaseSuite().toString()).stripLeading()); + return String.format("%s %s", getTierName(), AbstractCompilationPlan.PrintingUtils.indent(getPhaseSuite().toString()).stripLeading()); } /** diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FullFuzzedCompilationPlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FullFuzzedCompilationPlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java index f01e9537719e..08e153de2c6a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FullFuzzedCompilationPlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.util.stream.Collectors; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; +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; /** * Compilation plan that inserts optional phases in a {@link MinimalFuzzedCompilationPlan}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java index 52cdd98b421a..e3e93a6d6ed1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FullFuzzedTierPlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.util.ArrayList; import java.util.Collections; @@ -31,9 +31,9 @@ import java.util.Random; import java.util.Set; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; +import jdk.compiler.graal.nodes.GraphState; +import jdk.compiler.graal.phases.BasePhase; +import jdk.compiler.graal.phases.PhaseSuite; /** * Tier plan that inserts optional phases in a {@link MinimalFuzzedTierPlan}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FuzzedSuites.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FuzzedSuites.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java index b752632d5d7a..01a342d0a790 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/FuzzedSuites.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.util.Random; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.GraphState.MandatoryStages; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.tiers.Suites; +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; /** * {@link Suites} created by fuzzing the order of the phases in each tier. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java index 6602ae45f8f7..f978f8ee7d64 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.util.Random; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.GraphState.MandatoryStages; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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; /** * {@link AbstractCompilationPlan} created by fuzzing and only contains the phases required to diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java index 10968a3bee51..fbe86ad6a74b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/MinimalFuzzedTierPlan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.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 org.graalvm.compiler.core.phases.fuzzing.AbstractCompilationPlan.PrintingUtils; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.GraphState.StageFlag; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.BasePhase.NotApplicable; -import org.graalvm.compiler.phases.PhaseSuite; +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; /** * {@link AbstractTierPlan} that only contains the phases required to satisfy a given set of diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/PhasePlanSerializer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/PhasePlanSerializer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java index 20c555d4e0a4..c15f95c89557 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/fuzzing/PhasePlanSerializer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.phases.fuzzing; +package jdk.compiler.graal.core.phases.fuzzing; import java.io.ByteArrayOutputStream; import java.io.DataInputStream; @@ -36,13 +36,13 @@ import java.util.List; import java.util.Map; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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; /** * Provides tools to save a serialized version of the {@link Suites} to a file and load the diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64LoweringProviderMixin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64LoweringProviderMixin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java index 98d104ae70f2..5fa3ab26f574 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64LoweringProviderMixin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.core.riscv64; +package jdk.compiler.graal.core.riscv64; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.nodes.memory.ExtendableMemoryAccess; -import org.graalvm.compiler.nodes.spi.LoweringProvider; +import jdk.compiler.graal.core.common.memory.MemoryExtendKind; +import jdk.compiler.graal.nodes.memory.ExtendableMemoryAccess; +import jdk.compiler.graal.nodes.spi.LoweringProvider; public interface RISCV64LoweringProviderMixin extends LoweringProvider { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64NodeMatchRules.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64NodeMatchRules.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java index 775f2c6ae647..75a8c62be628 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64NodeMatchRules.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java @@ -23,10 +23,10 @@ * questions. */ -package org.graalvm.compiler.core.riscv64; +package jdk.compiler.graal.core.riscv64; -import org.graalvm.compiler.core.gen.NodeMatchRules; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +import jdk.compiler.graal.core.gen.NodeMatchRules; +import jdk.compiler.graal.lir.gen.LIRGeneratorTool; public class RISCV64NodeMatchRules extends NodeMatchRules { public RISCV64NodeMatchRules(LIRGeneratorTool gen) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64ReflectionUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64ReflectionUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java index abca576bb0a4..cef29a244706 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/RISCV64ReflectionUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.riscv64; +package jdk.compiler.graal.core.riscv64; import java.lang.reflect.Method; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/ShadowedRISCV64.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/ShadowedRISCV64.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java index e7a3fb0798eb..54dc1dba30da 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/riscv64/ShadowedRISCV64.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.core.riscv64; +package jdk.compiler.graal.core.riscv64; import jdk.vm.ci.code.Architecture; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/target/Backend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/target/Backend.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/target/Backend.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/target/Backend.java index ab9d053d2d4e..e78e28d0f4f7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/target/Backend.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/target/Backend.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.core.target; +package jdk.compiler.graal.core.target; import java.util.ArrayList; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.alloc.DefaultCodeEmissionOrder; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.gen.LIRCompilerBackend; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.asm.EntryPointDecorator; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.SuitesProvider; -import org.graalvm.compiler.phases.tiers.TargetProvider; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.code.BailoutException; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/AbstractKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AbstractKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/AbstractKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AbstractKey.java index 00530d5d32e7..4f26c968545c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/AbstractKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AbstractKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; /** * A name and index for a metric value. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/AccumulatedKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AccumulatedKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/AccumulatedKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AccumulatedKey.java index fdcd47122dc3..88404267ba71 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/AccumulatedKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AccumulatedKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; abstract class AccumulatedKey extends AbstractKey { protected final AbstractKey flat; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Assertions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Assertions.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Assertions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Assertions.java index 3f8ef0c246ed..e419790e884c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Assertions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Assertions.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.Option; +import jdk.compiler.graal.options.OptionKey; +import jdk.compiler.graal.options.OptionType; +import jdk.compiler.graal.options.OptionValues; /** * Utility for query whether assertions are enabled. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CSVUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CSVUtil.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CSVUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CSVUtil.java index d33433604077..ee0fabad2407 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CSVUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CSVUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.PrintStream; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CausableByCompilerAssert.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CausableByCompilerAssert.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java index 87fcb4ee99a5..a84d48f09fc3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CausableByCompilerAssert.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; public interface CausableByCompilerAssert { boolean isCausedByCompilerAssert(); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CloseableCounter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CloseableCounter.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CloseableCounter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CloseableCounter.java index 4f17760afa26..c12d8aa539ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CloseableCounter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CloseableCounter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/debug/CompilationListener.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CompilationListener.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CompilationListener.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CompilationListener.java index 8aaf7961720f..01db7af99ea2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CompilationListener.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CompilationListener.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; +import jdk.compiler.graal.debug.DebugContext.CompilerPhaseScope; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CounterKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CounterKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKey.java index 5287c0518e3e..f5cfea58ded8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CounterKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; /** * A counter for some value of interest. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CounterKeyImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKeyImpl.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CounterKeyImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKeyImpl.java index f81005c32f6f..9cb93978a21a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/CounterKeyImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKeyImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import org.graalvm.collections.Pair; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugCloseable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugCloseable.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugCloseable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugCloseable.java index b21091f14b8f..1633eace71d9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugCloseable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugCloseable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; /** * An {@link AutoCloseable} whose {@link #close()} does not throw a checked exception. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugConfig.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfig.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugConfig.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfig.java index 769569f95845..4715db192bb6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugConfig.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfig.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.PrintStream; import java.util.Collection; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.debug.DebugContext.Scope; +import jdk.compiler.graal.options.OptionValues; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugConfigImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfigImpl.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugConfigImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfigImpl.java index 8158562a5cfe..9b110a19b796 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugConfigImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfigImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import static org.graalvm.compiler.debug.DebugContext.BASIC_LEVEL; +import static jdk.compiler.graal.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 org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionValues; import jdk.vm.ci.code.BailoutException; import jdk.vm.ci.meta.JavaMethod; @@ -93,7 +93,7 @@ final class DebugConfigImpl implements DebugConfig { if (methodFilter == null || methodFilter.isEmpty()) { this.methodFilter = null; } else { - this.methodFilter = org.graalvm.compiler.debug.MethodFilter.parse(methodFilter); + this.methodFilter = MethodFilter.parse(methodFilter); } this.dumpHandlers = Collections.unmodifiableList(dumpHandlers); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugContext.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugContext.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugContext.java index de21a24b8cc8..72dd146a6e7a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugContext.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugContext.java @@ -22,24 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import static java.util.FormattableFlags.LEFT_JUSTIFY; import static java.util.FormattableFlags.UPPERCASE; -import static org.graalvm.compiler.debug.DebugOptions.Count; -import static org.graalvm.compiler.debug.DebugOptions.Counters; -import static org.graalvm.compiler.debug.DebugOptions.DisableIntercept; -import static org.graalvm.compiler.debug.DebugOptions.Dump; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnError; -import static org.graalvm.compiler.debug.DebugOptions.DumpOnPhaseChange; -import static org.graalvm.compiler.debug.DebugOptions.DumpPath; -import static org.graalvm.compiler.debug.DebugOptions.ListMetrics; -import static org.graalvm.compiler.debug.DebugOptions.Log; -import static org.graalvm.compiler.debug.DebugOptions.MemUseTrackers; -import static org.graalvm.compiler.debug.DebugOptions.ShowDumpFiles; -import static org.graalvm.compiler.debug.DebugOptions.Time; -import static org.graalvm.compiler.debug.DebugOptions.Timers; -import static org.graalvm.compiler.debug.DebugOptions.TrackMemUse; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -62,10 +48,10 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Pair; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.graphio.GraphOutput; +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.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.meta.JavaMethod; @@ -276,11 +262,11 @@ private static boolean isNotEmpty(OptionKey option, OptionValues options private Immutable(OptionValues options) { this.options = options; - String timeValue = Time.getValue(options); - String trackMemUseValue = TrackMemUse.getValue(options); - this.unscopedCounters = parseUnscopedMetricSpec(Counters.getValue(options), "".equals(Count.getValue(options)), false); - this.unscopedTimers = parseUnscopedMetricSpec(Timers.getValue(options), "".equals(timeValue), true); - this.unscopedMemUseTrackers = parseUnscopedMetricSpec(MemUseTrackers.getValue(options), "".equals(trackMemUseValue), true); + String timeValue = DebugOptions.Time.getValue(options); + String trackMemUseValue = DebugOptions.TrackMemUse.getValue(options); + this.unscopedCounters = parseUnscopedMetricSpec(DebugOptions.Counters.getValue(options), "".equals(DebugOptions.Count.getValue(options)), false); + this.unscopedTimers = parseUnscopedMetricSpec(DebugOptions.Timers.getValue(options), "".equals(timeValue), true); + this.unscopedMemUseTrackers = parseUnscopedMetricSpec(DebugOptions.MemUseTrackers.getValue(options), "".equals(trackMemUseValue), true); if (unscopedMemUseTrackers != null || trackMemUseValue != null) { if (!GraalServices.isThreadAllocatedMemorySupported()) { @@ -288,14 +274,14 @@ private Immutable(OptionValues options) { } } - this.scopesEnabled = DumpOnError.getValue(options) || - Dump.getValue(options) != null || - Log.getValue(options) != null || + this.scopesEnabled = DebugOptions.DumpOnError.getValue(options) || + DebugOptions.Dump.getValue(options) != null || + DebugOptions.Log.getValue(options) != null || isNotEmpty(DebugOptions.Count, options) || isNotEmpty(DebugOptions.Time, options) || isNotEmpty(DebugOptions.TrackMemUse, options) || - DumpOnPhaseChange.getValue(options) != null; - this.listMetrics = ListMetrics.getValue(options); + DebugOptions.DumpOnPhaseChange.getValue(options) != null; + this.listMetrics = DebugOptions.ListMetrics.getValue(options); } private Immutable() { @@ -642,7 +628,7 @@ private DebugContext(Description description, } else { currentConfig = new DebugConfigImpl(options, logStream, dumpHandlers, verifyHandlers); } - currentScope = new ScopeImpl(this, Thread.currentThread(), DisableIntercept.getValue(options)); + currentScope = new ScopeImpl(this, Thread.currentThread(), DebugOptions.DisableIntercept.getValue(options)); currentScope.updateFlags(currentConfig); metricsEnabled = true; } else { @@ -651,14 +637,14 @@ private DebugContext(Description description, } public String getDumpPath(String extension, boolean createMissingDirectory) { - return getDumpPath(extension, createMissingDirectory, ShowDumpFiles.getValue(immutable.options)); + return getDumpPath(extension, createMissingDirectory, DebugOptions.ShowDumpFiles.getValue(immutable.options)); } public String getDumpPath(String extension, boolean createMissingDirectory, boolean showDumpFiles) { try { String id = description == null ? null : description.identifier; String label = description == null ? null : description.getLabel(); - String result = PathUtilities.createUnique(immutable.options, DumpPath, id, label, extension, createMissingDirectory); + String result = PathUtilities.createUnique(immutable.options, DebugOptions.DumpPath, id, label, extension, createMissingDirectory); if (showDumpFiles) { TTY.println(DUMP_FILE_MESSAGE_FORMAT, result); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugDumpHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpHandler.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugDumpHandler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpHandler.java index fc8b047dd1ab..6fcf29fd55b3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugDumpHandler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.Closeable; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugDumpScope.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpScope.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugDumpScope.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpScope.java index 85b1bf5ddff6..273562da7349 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugDumpScope.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpScope.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; public class DebugDumpScope { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugFilter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugFilter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java index 2facd2b4b8b5..de2738371d1c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugFilter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.Arrays; import java.util.regex.Pattern; -import org.graalvm.compiler.debug.DebugContext.Scope; +import jdk.compiler.graal.debug.DebugContext.Scope; /** * Implements the filter specified by options such as {@link DebugOptions#Dump}, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandler.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugHandler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandler.java index 40abef01e4d5..1c94eed0ed4a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugHandler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; /** * This interface exists to unify {@link DebugDumpHandler} and {@link DebugVerifyHandler} for the diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugHandlersFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandlersFactory.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugHandlersFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandlersFactory.java index 8c0bac0eab6a..41308d5e7b90 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugHandlersFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandlersFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.Iterator; import java.util.List; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.options.OptionValues; +import jdk.compiler.graal.serviceprovider.GraalServices; /** * Factory for creating {@link DebugHandler}s. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugOptions.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugOptions.java index eef20b768689..13e8468820c8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugOptions.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import static org.graalvm.compiler.debug.PathUtilities.createDirectories; -import static org.graalvm.compiler.debug.PathUtilities.exists; -import static org.graalvm.compiler.debug.PathUtilities.getAbsolutePath; -import static org.graalvm.compiler.debug.PathUtilities.getPath; +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 java.io.IOException; import java.text.SimpleDateFormat; import java.util.Date; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.options.EnumMultiOptionKey; -import org.graalvm.compiler.options.EnumOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +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; /** * Options that configure a {@link DebugContext} and related functionality. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugVerifyHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugVerifyHandler.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugVerifyHandler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugVerifyHandler.java index 6f4c1f42e3e4..b6e25bc7e26c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DebugVerifyHandler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugVerifyHandler.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; /** * Performs some kind of verification on an object. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java index 7125bd9dcdcf..8a3ad50d1a8b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/DiagnosticsOutputDirectory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.IOException; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.IsolateUtil; +import jdk.compiler.graal.options.OptionValues; +import jdk.compiler.graal.serviceprovider.GraalServices; +import jdk.compiler.graal.serviceprovider.IsolateUtil; /** * Manages a directory into which diagnostics such crash reports and dumps should be written. The diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/GlobalMetrics.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GlobalMetrics.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/GlobalMetrics.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GlobalMetrics.java index 2166555efeff..67a1df1dcd42 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/GlobalMetrics.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GlobalMetrics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.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 org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.IsolateUtil; +import jdk.compiler.graal.options.OptionValues; +import jdk.compiler.graal.serviceprovider.IsolateUtil; /** * Metric values that can be {@linkplain #add(DebugContext) updated} by multiple threads. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/GraalError.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GraalError.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/GraalError.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GraalError.java index e0c0a6b7c83e..a64c824fc9b1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/GraalError.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GraalError.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.ArrayList; import java.util.Locale; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/IgvDumpChannel.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/IgvDumpChannel.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/IgvDumpChannel.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/IgvDumpChannel.java index e5b36d8ee1a2..2886b832cea6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/IgvDumpChannel.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/IgvDumpChannel.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import static org.graalvm.compiler.debug.DebugOptions.PrintGraphHost; -import static org.graalvm.compiler.debug.DebugOptions.PrintGraphPort; -import static org.graalvm.compiler.debug.PathUtilities.getParent; -import static org.graalvm.compiler.debug.PathUtilities.isDirectory; +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 java.io.IOException; import java.io.InterruptedIOException; @@ -39,8 +39,8 @@ import java.nio.file.StandardOpenOption; import java.util.function.Supplier; -import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.debug.DebugOptions.PrintGraphTarget; +import jdk.compiler.graal.options.OptionValues; import jdk.vm.ci.common.NativeImageReinitialize; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Indent.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Indent.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Indent.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Indent.java index 2532b30d3837..870fce61cdc4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Indent.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Indent.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; /** * Object used to close a debug {@link DebugContext#indent() indentation} scope. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/JavaMethodContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/JavaMethodContext.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/JavaMethodContext.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/JavaMethodContext.java index 09266f65be28..a0280239e55f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/JavaMethodContext.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/JavaMethodContext.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/KeyRegistry.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/KeyRegistry.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/KeyRegistry.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/KeyRegistry.java index 037c2a3f8345..34244338d9f6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/KeyRegistry.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/KeyRegistry.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.ArrayList; import java.util.List; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/LogStream.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/LogStream.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/LogStream.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/LogStream.java index 1af1c0f9e09f..44f6ce9425bc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/LogStream.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/LogStream.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.IOException; import java.io.OutputStream; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MemUseTrackerKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKey.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MemUseTrackerKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKey.java index b04d24ad6904..589cd4f88b5d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MemUseTrackerKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKey.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.serviceprovider.GraalServices; /** * Tracks memory usage within a scope using {@code com.sun.management.ThreadMXBean}. This facility diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java index a22c2917773b..5f7fd96a823c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MemUseTrackerKeyImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import static org.graalvm.compiler.debug.DebugCloseable.VOID_CLOSEABLE; +import static jdk.compiler.graal.debug.DebugCloseable.VOID_CLOSEABLE; import org.graalvm.collections.Pair; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MethodFilter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MethodFilter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java index ebe3051ef800..c71f34ac7115 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MethodFilter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MetricKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MetricKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MetricKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MetricKey.java index bba5acd6c1cf..2b087cf29b31 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/MetricKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MetricKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.Comparator; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/PathUtilities.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilities.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/PathUtilities.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilities.java index 445f55e52820..0ae113796039 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/PathUtilities.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilities.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.File; import java.io.IOException; @@ -37,8 +37,8 @@ import java.util.Iterator; import java.util.ServiceLoader; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.options.OptionKey; +import jdk.compiler.graal.options.OptionValues; /** * Miscellaneous methods for modifying and generating file system paths. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/PathUtilitiesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/PathUtilitiesProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java index f41b4c5e60f1..80c903bb8645 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/PathUtilitiesProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.File; import java.io.FileInputStream; @@ -45,9 +45,9 @@ * 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/org.graalvm.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 + * {@code META-INF/services/jdk.compiler.graal.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 * context of building a native image. */ diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/ScopeImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/ScopeImpl.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/ScopeImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/ScopeImpl.java index deb4e430525f..afaaee6ed2fc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/ScopeImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/ScopeImpl.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.PrintStream; import java.util.Iterator; -import org.graalvm.compiler.debug.DebugContext.DisabledScope; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.debug.DebugContext.DisabledScope; +import jdk.compiler.graal.serviceprovider.GraalServices; import jdk.vm.ci.meta.JavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java index dd26998a9b8c..27105cc148ec 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/StandardPathUtilitiesProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.File; import java.io.FileInputStream; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TTY.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTY.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TTY.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTY.java index 11ee234b5c89..45cec6dced06 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TTY.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTY.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.PrintStream; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.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_org_graalvm_compiler_debug_TTY}. + * Substituted by {@code com.oracle.svm.graal.Target_jdk_compiler_graal_debug_TTY}. */ public static final PrintStream out; static { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TTYStreamProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTYStreamProvider.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TTYStreamProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTYStreamProvider.java index 5fe64b8fea15..18a1b0af9e12 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TTYStreamProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTYStreamProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.PrintStream; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimeSource.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimeSource.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimeSource.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimeSource.java index 3b0a5958898a..733e0c689594 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimeSource.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimeSource.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import org.graalvm.compiler.serviceprovider.GraalServices; +import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/debug/TimerKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKey.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimerKey.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKey.java index 9b3cb64060a5..bbf1f786fc09 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimerKey.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKey.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.util.concurrent.TimeUnit; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimerKeyImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKeyImpl.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimerKeyImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKeyImpl.java index de5e5270fd8f..4731333ce738 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/TimerKeyImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKeyImpl.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; -import static org.graalvm.compiler.debug.DebugCloseable.VOID_CLOSEABLE; +import static jdk.compiler.graal.debug.DebugCloseable.VOID_CLOSEABLE; import java.util.concurrent.TimeUnit; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Versions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Versions.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Versions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Versions.java index 56c32f2bdefe..89e2f40aebf8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/Versions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Versions.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.debug; +package jdk.compiler.graal.debug; import java.io.BufferedReader; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt index 0b45b9df7a63..8ad02ce906e2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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". --------- - org.graalvm.compiler.nodes.PhiNode.* + jdk.compiler.graal.nodes.PhiNode.* - Matches all methods in the class "org.graalvm.compiler.nodes.PhiNode". + Matches all methods in the class "jdk.compiler.graal.nodes.PhiNode". --------- - org.graalvm.compiler.nodes.*.canonical + jdk.compiler.graal.nodes.*.canonical Matches all methods named "canonical" in classes in the package - "org.graalvm.compiler.nodes". + "jdk.compiler.graal.nodes". --------- arraycopy,toString diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/MetricsFileHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/MetricsFileHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/OptimizationLogHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/OptimizationLogHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/PrintGraphHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/debug/doc-files/PrintGraphHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Edges.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Edges.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Edges.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Edges.java index c6324e6681de..9934b6b8421b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Edges.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Edges.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import static org.graalvm.compiler.graph.Graph.isNodeModificationCountsEnabled; -import static org.graalvm.compiler.graph.Node.NOT_ITERABLE; +import static jdk.compiler.graal.graph.Graph.isNodeModificationCountsEnabled; +import static jdk.compiler.graal.graph.Node.NOT_ITERABLE; import java.util.ArrayList; import java.util.Iterator; -import org.graalvm.compiler.core.common.Fields; -import org.graalvm.compiler.core.common.FieldsScanner; -import org.graalvm.compiler.graph.NodeClass.EdgeInfo; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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 sun.misc.Unsafe; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/GraalGraphError.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraalGraphError.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/GraalGraphError.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraalGraphError.java index e766c4db48d0..fa9b41d8be3f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/GraalGraphError.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraalGraphError.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodeinfo.Verbosity; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.nodeinfo.Verbosity; /** * This error is the graph/node aware extension of {@link GraalError}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Graph.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Graph.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Graph.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Graph.java index cab895fbf65b..bf25752880ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Graph.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Graph.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import static org.graalvm.compiler.core.common.GraalOptions.TrackNodeInsertion; +import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.core.common.util.EventCounter; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.graph.Node.NodeInsertionStackTrace; -import org.graalvm.compiler.graph.Node.ValueNumberable; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.graph.iterators.NodePredicate; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/GraphNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraphNodeIterator.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/GraphNodeIterator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraphNodeIterator.java index 896a3246af71..9de41b6548c3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/GraphNodeIterator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraphNodeIterator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.Iterator; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/InputEdges.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/InputEdges.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/InputEdges.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/InputEdges.java index 3a1070c4bfc8..87ddddf575b5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/InputEdges.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/InputEdges.java @@ -22,14 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; - -import static org.graalvm.compiler.graph.Edges.Type.Inputs; +package jdk.compiler.graal.graph; import java.util.ArrayList; -import org.graalvm.compiler.graph.NodeClass.InputInfo; -import org.graalvm.compiler.nodeinfo.InputType; +import jdk.compiler.graal.graph.NodeClass.InputInfo; +import jdk.compiler.graal.nodeinfo.InputType; public final class InputEdges extends Edges { @@ -37,7 +35,7 @@ public final class InputEdges extends Edges { private final boolean[] isOptional; public InputEdges(int directCount, ArrayList edges) { - super(Inputs, directCount, edges); + super(Type.Inputs, directCount, edges); this.inputTypes = new InputType[edges.size()]; this.isOptional = new boolean[edges.size()]; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/IterableNodeType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/IterableNodeType.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/IterableNodeType.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/IterableNodeType.java index 0a5d6c94a1bf..31046c744efb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/IterableNodeType.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/IterableNodeType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; /** * A marker for a node type supporting {@linkplain Graph#getNodes(NodeClass) fast iteration} of its diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/LinkedStack.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/LinkedStack.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/LinkedStack.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/LinkedStack.java index 94f284baed14..380af41f65af 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/LinkedStack.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/LinkedStack.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; /** * A stack implementation that uses a singly linked list as its underlying storage strategy making diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/MemoryKillMarker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/MemoryKillMarker.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/MemoryKillMarker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/MemoryKillMarker.java index 9f3db2a57b31..1f6e0765d277 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/MemoryKillMarker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/MemoryKillMarker.java @@ -22,12 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; + +import jdk.compiler.graal.nodeinfo.InputType; +import jdk.compiler.graal.nodeinfo.NodeInfo; /** - * Any node that includes {@link org.graalvm.compiler.nodeinfo.InputType#Memory InputType.Memory} in - * {@link org.graalvm.compiler.nodeinfo.NodeInfo#allowedUsageTypes() NodeInfo.allowedUsageTypes} - * must also implement a subtype of this interface. + * Any node that includes {@link InputType#Memory InputType.Memory} in + * {@link NodeInfo#allowedUsageTypes() NodeInfo.allowedUsageTypes} must also implement a subtype of + * this interface. */ public interface MemoryKillMarker { } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Node.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Node.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Node.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Node.java index 37f0768636c5..af549e462481 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Node.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Node.java @@ -22,12 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import static org.graalvm.compiler.graph.Edges.Type.Inputs; -import static org.graalvm.compiler.graph.Edges.Type.Successors; -import static org.graalvm.compiler.graph.Graph.isNodeModificationCountsEnabled; -import static org.graalvm.compiler.serviceprovider.GraalUnsafeAccess.getUnsafe; +import static jdk.compiler.graal.serviceprovider.GraalUnsafeAccess.getUnsafe; import java.lang.annotation.ElementType; import java.lang.annotation.RetentionPolicy; @@ -43,22 +40,21 @@ import java.util.function.Predicate; import java.util.function.Supplier; -import org.graalvm.compiler.core.common.Fields; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Graph.NodeEventListener; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.graph.iterators.NodePredicate; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.services.Services; import sun.misc.Unsafe; @@ -589,27 +585,27 @@ public final Node predecessor() { } public final int modCount() { - if (isNodeModificationCountsEnabled() && graph != null) { + if (Graph.isNodeModificationCountsEnabled() && graph != null) { return graph.getNodeModCount(this); } return 0; } final void incModCount() { - if (isNodeModificationCountsEnabled() && graph != null) { + if (Graph.isNodeModificationCountsEnabled() && graph != null) { graph.incNodeModCount(this); } } final int usageModCount() { - if (isNodeModificationCountsEnabled() && graph != null) { + if (Graph.isNodeModificationCountsEnabled() && graph != null) { return graph.nodeUsageModCount(this); } return 0; } final void incUsageModCount() { - if (isNodeModificationCountsEnabled() && graph != null) { + if (Graph.isNodeModificationCountsEnabled() && graph != null) { graph.incNodeUsageModCount(this); } } @@ -1076,7 +1072,7 @@ public void replaceAtUsages(Node replacement, InputType... inputTypes) { private void maybeNotifyInputChanged(Node node) { if (graph != null) { assert !graph.isFrozen(); - NodeEventListener listener = graph.nodeEventListener; + Graph.NodeEventListener listener = graph.nodeEventListener; if (listener != null) { listener.event(Graph.NodeEvent.INPUT_CHANGED, node); } @@ -1085,14 +1081,14 @@ private void maybeNotifyInputChanged(Node node) { } /** - * Iterates over each {@link NodeEventListener} attached to {@code this.graph()} if + * Iterates over each {@link Graph.NodeEventListener} attached to {@code this.graph()} if * {@code node.isAlive()} and notifies the listener that {@code node} has had its last usage * removed. */ public void maybeNotifyZeroUsages(Node node) { if (graph != null && node.isAlive()) { assert !graph.isFrozen(); - NodeEventListener listener = graph.nodeEventListener; + Graph.NodeEventListener listener = graph.nodeEventListener; if (listener != null) { listener.event(Graph.NodeEvent.ZERO_USAGES, node); } @@ -1279,7 +1275,7 @@ private void copyOrClearEdgesForClone(Node newNode, Edges.Type type, EnumSet WithAllEdges = EnumSet.allOf(Edges.Type.class); - public static final EnumSet WithOnlyInputEdges = EnumSet.of(Inputs); + public static final EnumSet WithOnlyInputEdges = EnumSet.of(Edges.Type.Inputs); /** * Makes a copy of {@code this} in(to) a given graph. @@ -1309,8 +1305,8 @@ final Node clone(Graph into, EnumSet edgesToCopy) { newNode = (Node) UNSAFE.allocateInstance(getClass()); newNode.nodeClass = nodeClassTmp; nodeClassTmp.getData().copy(this, newNode); - copyOrClearEdgesForClone(newNode, Inputs, edgesToCopy); - copyOrClearEdgesForClone(newNode, Successors, edgesToCopy); + copyOrClearEdgesForClone(newNode, Edges.Type.Inputs, edgesToCopy); + copyOrClearEdgesForClone(newNode, Edges.Type.Successors, edgesToCopy); } catch (Exception e) { throw new GraalGraphError(e).addContext(this); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeBitMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeBitMap.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeBitMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeBitMap.java index 74c9a00c1396..326fd3d4d224 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeBitMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeBitMap.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.Arrays; import java.util.ConcurrentModificationException; import java.util.Iterator; import java.util.NoSuchElementException; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.graph.iterators.NodeIterable; +import jdk.compiler.graal.core.common.util.CompilationAlarm; +import jdk.compiler.graal.graph.iterators.NodeIterable; public final class NodeBitMap extends NodeIdAccessor implements NodeIterable { private static final int SHIFT = 6; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeClass.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeClass.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeClass.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeClass.java index ba0326233532..99ed99ad4622 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeClass.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeClass.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import static org.graalvm.compiler.core.common.Fields.translateInto; -import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere; -import static org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue; -import static org.graalvm.compiler.graph.Edges.translateInto; -import static org.graalvm.compiler.graph.Graph.isNodeModificationCountsEnabled; -import static org.graalvm.compiler.graph.InputEdges.translateInto; -import static org.graalvm.compiler.graph.Node.WithAllEdges; +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 java.lang.annotation.Annotation; import java.lang.reflect.AnnotatedElement; @@ -44,33 +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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.FieldIntrospection; -import org.graalvm.compiler.core.common.Fields; -import org.graalvm.compiler.core.common.FieldsScanner; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.graph.Edges.Type; -import org.graalvm.compiler.graph.Graph.DuplicationReplacement; -import org.graalvm.compiler.graph.Node.EdgeVisitor; -import org.graalvm.compiler.graph.Node.Input; -import org.graalvm.compiler.graph.Node.OptionalInput; -import org.graalvm.compiler.graph.Node.Successor; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.graph.spi.BinaryCommutativeMarker; -import org.graalvm.compiler.graph.spi.CanonicalizableMarker; -import org.graalvm.compiler.graph.spi.NodeWithIdentity; -import org.graalvm.compiler.graph.spi.SimplifiableMarker; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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 sun.misc.Unsafe; @@ -302,7 +299,7 @@ public NodeSize size() { return size; } - public static long computeIterationMask(Type type, int directCount, long[] offsets) { + public static long computeIterationMask(Edges.Type type, int directCount, long[] offsets) { long mask = 0; if (offsets.length > NodeClass.MAX_EDGES) { throw new GraalError("Exceeded maximum of %d edges (%s)", NodeClass.MAX_EDGES, type); @@ -441,7 +438,7 @@ public int compareTo(FieldsScanner.FieldInfo o) { } /** - * Describes a field representing an {@linkplain Type#Inputs input} edge in a node. + * Describes a field representing an {@linkplain Edges.Type#Inputs input} edge in a node. */ protected static class InputInfo extends EdgeInfo { final InputType inputType; @@ -471,8 +468,8 @@ protected NodeFieldsScanner(FieldsScanner.CalcOffset calc, NodeClass superNod super(calc); this.debug = debug; if (superNodeClass != null) { - translateInto(superNodeClass.inputs, inputs); - translateInto(superNodeClass.successors, successors); + InputEdges.translateInto(superNodeClass.inputs, inputs); + Edges.translateInto(superNodeClass.successors, successors); translateInto(superNodeClass.data, data); directInputs = superNodeClass.inputs.getDirectCount(); directSuccessors = superNodeClass.successors.getDirectCount(); @@ -770,7 +767,7 @@ public boolean isValid(Position pos, NodeClass from, Edges fromEdges) { static void updateEdgesInPlace(Node node, InplaceUpdateClosure duplicationReplacement, Edges edges) { int index = 0; - Type curType = edges.type(); + Edges.Type curType = edges.type(); int directCount = edges.getDirectCount(); final long[] curOffsets = edges.getOffsets(); while (index < directCount) { @@ -862,7 +859,7 @@ interface InplaceUpdateClosure { Node replacement(Node node, Edges.Type type); } - static EconomicMap addGraphDuplicate(final Graph graph, final Graph oldGraph, int estimatedNodeCount, Iterable nodes, final DuplicationReplacement replacements) { + static EconomicMap addGraphDuplicate(final Graph graph, final Graph oldGraph, int estimatedNodeCount, Iterable nodes, final Graph.DuplicationReplacement replacements) { final EconomicMap newNodes; int denseThreshold = oldGraph.getNodeCount() + oldGraph.getNodesDeletedSinceLastCompression() >> 4; if (estimatedNodeCount > denseThreshold) { @@ -912,7 +909,7 @@ public Node replacement(Node node, Edges.Type type) { return newNodes; } - private static void createNodeDuplicates(final Graph graph, Iterable nodes, final DuplicationReplacement replacements, final EconomicMap newNodes) { + private static void createNodeDuplicates(final Graph graph, Iterable nodes, final Graph.DuplicationReplacement replacements, final EconomicMap newNodes) { for (Node node : nodes) { if (node != null) { assert !node.isDeleted() : "trying to duplicate deleted node: " + node; @@ -933,12 +930,12 @@ private static void createNodeDuplicates(final Graph graph, Iterable newNodes, Node oldNode, Node node) { + private static void transferEdgesDifferentNodeClass(final Graph graph, final Graph.DuplicationReplacement replacements, final EconomicMap newNodes, Node oldNode, Node node) { transferEdges(graph, replacements, newNodes, oldNode, node, Edges.Type.Inputs); transferEdges(graph, replacements, newNodes, oldNode, node, Edges.Type.Successors); } - private static void transferEdges(final Graph graph, final DuplicationReplacement replacements, final EconomicMap newNodes, Node oldNode, Node node, Edges.Type type) { + private static void transferEdges(final Graph graph, final Graph.DuplicationReplacement replacements, final EconomicMap newNodes, Node oldNode, Node node, Edges.Type type) { NodeClass nodeClass = node.getNodeClass(); NodeClass oldNodeClass = oldNode.getNodeClass(); Edges oldEdges = oldNodeClass.getEdges(type); @@ -1100,7 +1097,7 @@ private static final class RawEdgesWithModCountIterator extends RawEdgesIterator private RawEdgesWithModCountIterator(Node node, long mask) { super(node, mask); - assert isNodeModificationCountsEnabled(); + assert Graph.isNodeModificationCountsEnabled(); this.modCount = node.modCount(); } @@ -1138,7 +1135,7 @@ public NodeIterable getSuccessorIterable(final Node node) { @Override public Iterator iterator() { - if (isNodeModificationCountsEnabled()) { + if (Graph.isNodeModificationCountsEnabled()) { return new RawEdgesWithModCountIterator(node, mask); } else { return new RawEdgesIterator(node, mask); @@ -1172,7 +1169,7 @@ public NodeIterable getInputIterable(final Node node) { @Override public Iterator iterator() { - if (isNodeModificationCountsEnabled()) { + if (Graph.isNodeModificationCountsEnabled()) { return new RawEdgesWithModCountIterator(node, mask); } else { return new RawEdgesIterator(node, mask); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeFlood.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeFlood.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeFlood.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeFlood.java index 083d67cfcafa..fd1e2b1fa7ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeFlood.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeFlood.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.ArrayDeque; import java.util.Iterator; import java.util.Queue; -import org.graalvm.compiler.graph.NodeWorkList.SingletonNodeWorkList; +import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeIdAccessor.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeIdAccessor.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeIdAccessor.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeIdAccessor.java index 98c81affc4b7..26f3ea06c14f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeIdAccessor.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeIdAccessor.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; /** * An entity that depends upon {@linkplain Graph#maybeCompress() stable} node identifiers. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeInputList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeInputList.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeInputList.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeInputList.java index 93a0e9a7b903..380a223f5a79 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeInputList.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeInputList.java @@ -22,14 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; - -import static org.graalvm.compiler.graph.Edges.Type.Inputs; +package jdk.compiler.graal.graph; import java.util.List; -import org.graalvm.compiler.graph.Edges.Type; - public final class NodeInputList extends NodeList { public NodeInputList(Node self, int initialSize) { @@ -56,7 +52,7 @@ protected void update(T oldNode, T newNode) { } @Override - public Type getEdgesType() { - return Inputs; + public Edges.Type getEdgesType() { + return Edges.Type.Inputs; } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeList.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeList.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeList.java index 9a2476cd2129..81b93cc49450 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeList.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeList.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.AbstractList; import java.util.Arrays; @@ -32,9 +32,9 @@ import java.util.RandomAccess; import java.util.stream.Stream; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.iterators.NodeIterable; +import jdk.compiler.graal.core.common.PermanentBailoutException; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.graph.iterators.NodeIterable; public abstract class NodeList extends AbstractList implements NodeIterable, RandomAccess { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeMap.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeMap.java index d04f0048ff4d..828f899c552a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeMap.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.Arrays; import java.util.Iterator; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeSourcePosition.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSourcePosition.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeSourcePosition.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSourcePosition.java index f164c9ca97e0..37c0f560b7e8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeSourcePosition.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSourcePosition.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import static org.graalvm.compiler.graph.NodeSourcePosition.Marker.None; -import static org.graalvm.compiler.graph.NodeSourcePosition.Marker.Placeholder; -import static org.graalvm.compiler.graph.NodeSourcePosition.Marker.Substitution; +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 java.util.Iterator; import java.util.Objects; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; -import org.graalvm.compiler.bytecode.Bytecodes; +import jdk.compiler.graal.bytecode.BytecodeDisassembler; +import jdk.compiler.graal.bytecode.Bytecodes; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.BytecodePosition; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeStack.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeStack.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeStack.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeStack.java index 9142aeb82931..4ad9ac667671 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeStack.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeStack.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; public final class NodeStack { private static final int DEFAULT_INITIAL_SIZE = 8; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeSuccessorList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSuccessorList.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeSuccessorList.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSuccessorList.java index 17aea088ff63..ece338eb3bc7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeSuccessorList.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSuccessorList.java @@ -22,14 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; - -import static org.graalvm.compiler.graph.Edges.Type.Successors; +package jdk.compiler.graal.graph; import java.util.List; -import org.graalvm.compiler.graph.Edges.Type; - public final class NodeSuccessorList extends NodeList { public NodeSuccessorList(Node self, int initialSize) { @@ -56,7 +52,7 @@ protected void update(T oldNode, T newNode) { } @Override - public Type getEdgesType() { - return Successors; + public Edges.Type getEdgesType() { + return Edges.Type.Successors; } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUnionFind.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUnionFind.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUnionFind.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUnionFind.java index 5a02ababe754..92b0700bd5de 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUnionFind.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUnionFind.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; /** * Union-find data structure for {@link Node Nodes}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageIterable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterable.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageIterable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterable.java index 5433eaeaf275..a9ce10ca5bcf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageIterable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterable.java @@ -22,13 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; - -import static org.graalvm.compiler.graph.Graph.isNodeModificationCountsEnabled; +package jdk.compiler.graal.graph; import java.util.Iterator; -import org.graalvm.compiler.graph.iterators.NodeIterable; +import jdk.compiler.graal.graph.iterators.NodeIterable; class NodeUsageIterable implements NodeIterable { @@ -40,7 +38,7 @@ class NodeUsageIterable implements NodeIterable { @Override public NodeUsageIterator iterator() { - if (isNodeModificationCountsEnabled()) { + if (Graph.isNodeModificationCountsEnabled()) { return new NodeUsageWithModCountIterator(node); } else { return new NodeUsageIterator(node); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterator.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageIterator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterator.java index 283455c7c323..a9a816b039cc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageIterator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.Iterator; import java.util.NoSuchElementException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java index ef9e064a23fc..03e6aace3914 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeUsageWithModCountIterator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.ConcurrentModificationException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeWorkList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeWorkList.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeWorkList.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeWorkList.java index 4669a71411f7..38e6117d845b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/NodeWorkList.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeWorkList.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.ArrayDeque; import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Queue; -import org.graalvm.compiler.debug.DebugContext; +import jdk.compiler.graal.debug.DebugContext; public abstract class NodeWorkList implements Iterable { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Position.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Position.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Position.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Position.java index 87f03a44bf54..0948d655434d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/Position.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Position.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import org.graalvm.compiler.nodeinfo.InputType; +import jdk.compiler.graal.nodeinfo.InputType; /** * Describes an edge slot for a {@link NodeClass}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SourceLanguagePosition.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePosition.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SourceLanguagePosition.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePosition.java index 89ab80037047..95ccd284794d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SourceLanguagePosition.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePosition.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.net.URI; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SourceLanguagePositionProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SourceLanguagePositionProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java index 253db14e7cb8..de9dee73d9b6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SourceLanguagePositionProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SuccessorEdges.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SuccessorEdges.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SuccessorEdges.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SuccessorEdges.java index d76b96ce788a..9be173548e7a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/SuccessorEdges.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SuccessorEdges.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; -import static org.graalvm.compiler.graph.Edges.Type.Successors; +import static jdk.compiler.graal.graph.Edges.Type.Successors; import java.util.ArrayList; -import org.graalvm.compiler.graph.NodeClass.EdgeInfo; +import jdk.compiler.graal.graph.NodeClass.EdgeInfo; public final class SuccessorEdges extends Edges { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java index e04dc2dfe951..3a81ac607adf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/TypedGraphNodeIterator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; import java.util.Iterator; import java.util.NoSuchElementException; -import org.graalvm.compiler.core.common.util.CompilationAlarm; +import jdk.compiler.graal.core.common.util.CompilationAlarm; class TypedGraphNodeIterator implements Iterator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java index 04f7f47a8d1f..4cf1c77320c4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/FilteredNodeIterable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.iterators; +package jdk.compiler.graal.graph.iterators; import java.util.Iterator; -import org.graalvm.compiler.graph.Node; +import jdk.compiler.graal.graph.Node; public class FilteredNodeIterable implements NodeIterable { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodeIterable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterable.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodeIterable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterable.java index 8322bd8186a9..e1f4789d91df 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodeIterable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.iterators; +package jdk.compiler.graal.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 org.graalvm.compiler.graph.Node; +import jdk.compiler.graal.graph.Node; public interface NodeIterable extends Iterable { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterator.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodeIterator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterator.java index 180c33f9c481..434081268602 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodeIterator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.iterators; +package jdk.compiler.graal.graph.iterators; import java.util.Iterator; import java.util.NoSuchElementException; -import org.graalvm.compiler.graph.Node; +import jdk.compiler.graal.graph.Node; public abstract class NodeIterator implements Iterator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodePredicate.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicate.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodePredicate.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicate.java index c4e9005eaf9a..c2a93a9de26a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodePredicate.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicate.java @@ -22,12 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.iterators; +package jdk.compiler.graal.graph.iterators; import java.util.function.Predicate; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodePredicates.AndPredicate; +import jdk.compiler.graal.graph.Node; public interface NodePredicate extends Predicate { @@ -39,6 +38,6 @@ default boolean test(Node n) { } default NodePredicate and(NodePredicate np) { - return new AndPredicate(this, np); + return new NodePredicates.AndPredicate(this, np); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodePredicates.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicates.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodePredicates.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicates.java index 0322e4137b28..eb1509c91924 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/NodePredicates.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicates.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.iterators; +package jdk.compiler.graal.graph.iterators; -import org.graalvm.compiler.graph.Node; +import jdk.compiler.graal.graph.Node; public abstract class NodePredicates { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java index 0e2331b32129..5b988056347b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/iterators/PredicatedProxyNodeIterator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.iterators; +package jdk.compiler.graal.graph.iterators; import java.util.Iterator; -import org.graalvm.compiler.graph.Node; +import jdk.compiler.graal.graph.Node; public class PredicatedProxyNodeIterator extends NodeIterator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/package-info.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/package-info.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/package-info.java index 534b3c49090d..c05e17cacc23 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/package-info.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.graph; +package jdk.compiler.graal.graph; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/BinaryCommutativeMarker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/BinaryCommutativeMarker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java index 7ba9189abaee..c107c1174d26 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/BinaryCommutativeMarker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.spi; +package jdk.compiler.graal.graph.spi; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.graph.NodeClass; /** * A marker interface for {@link Node} classes that can be efficiently queried via diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/CanonicalizableMarker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/CanonicalizableMarker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java index bb0206654ae1..88eeb3071236 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/CanonicalizableMarker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.spi; +package jdk.compiler.graal.graph.spi; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.graph.NodeClass; /** * A marker interface for {@link Node} classes that can be efficiently queried via diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/NodeWithIdentity.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/NodeWithIdentity.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java index ed572b957e45..d9272b454366 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/NodeWithIdentity.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.spi; +package jdk.compiler.graal.graph.spi; -import org.graalvm.compiler.graph.NodeClass; +import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/SimplifiableMarker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/SimplifiableMarker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java index ac9b3498b2f9..c03c7d4d2c83 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/graph/spi/SimplifiableMarker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.graph.spi; +package jdk.compiler.graal.graph.spi; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.graph.NodeClass; /** * A marker interface for {@link Node} classes that can be efficiently queried via diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/DefaultGraphBlocks.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/DefaultGraphBlocks.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java index 7c3957de396c..45a64cab7afc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/DefaultGraphBlocks.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.util.Collection; import java.util.Collections; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/DefaultGraphTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/DefaultGraphTypes.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java index 89e5f269c63e..bff001ea7c2f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/DefaultGraphTypes.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; final class DefaultGraphTypes implements GraphTypes { static final GraphTypes DEFAULT = new DefaultGraphTypes(); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphBlocks.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphBlocks.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphBlocks.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphBlocks.java index d3199a884c2e..4027b6e15abb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphBlocks.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphBlocks.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.util.Collection; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphElements.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphElements.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphElements.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphElements.java index 2186cce33969..661d2020b4ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphElements.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphElements.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; /** * Representation of methods, fields, their signatures and code locations. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphJavadocSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphJavadocSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java index 48328b086dea..d69b34e52af8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphJavadocSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.io.File; import java.io.FileOutputStream; @@ -38,7 +38,7 @@ final class GraphJavadocSnippets { static GraphStructure acmeGraphStructure() { // @formatter:off - // BEGIN: org.graalvm.graphio.GraphJavadocSnippets#acmeGraphStructure + // BEGIN: jdk.compiler.graal.graphio.GraphJavadocSnippets#acmeGraphStructure class AcmeGraphStructure implements GraphStructure { @@ -142,12 +142,12 @@ public Collection edgeNodes( } } - // END: org.graalvm.graphio.GraphJavadocSnippets#acmeGraphStructure + // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#acmeGraphStructure return new AcmeGraphStructure(); } - // BEGIN: org.graalvm.graphio.GraphJavadocSnippets#buildOutput + // BEGIN: jdk.compiler.graal.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: org.graalvm.graphio.GraphJavadocSnippets#buildOutput + // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#buildOutput - // BEGIN: org.graalvm.graphio.GraphJavadocSnippets#buildAll + // BEGIN: jdk.compiler.graal.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: org.graalvm.graphio.GraphJavadocSnippets#buildAll + // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#buildAll private static GraphTypes acmeTypes() { GraphTypes graphTypes = null; @@ -259,7 +259,7 @@ private static class AcmeSignature { private static class AcmeCodePosition { } - // BEGIN: org.graalvm.graphio.GraphJavadocSnippets#dump + // BEGIN: jdk.compiler.graal.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: org.graalvm.graphio.GraphJavadocSnippets#dump + // END: jdk.compiler.graal.graphio.GraphJavadocSnippets#dump } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphLocations.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphLocations.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphLocations.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphLocations.java index 1144b212ff42..9aad6669777f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphLocations.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphLocations.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.net.URI; import java.net.URISyntaxException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphOutput.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphOutput.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphOutput.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphOutput.java index f5b42c049227..7ffebfa13016 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphOutput.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphOutput.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.io.Closeable; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphProtocol.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphProtocol.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphProtocol.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphProtocol.java index d41e96c904f0..64bb8f3fc431 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphProtocol.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphProtocol.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.io.Closeable; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphStructure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphStructure.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphStructure.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphStructure.java index c3fef62cf419..a13ca3601799 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphStructure.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphStructure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.util.Collection; import java.util.Map; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphTypes.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphTypes.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphTypes.java index 883e43c6a94e..69609241a68b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/GraphTypes.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphTypes.java @@ -22,14 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; /** * Special support for dealing with enums. Normally one can represent various {@link GraphOutput * graph} enum values with real {@link Enum} instances. In case this is not possible, the - * {@link GraphOutput.Builder} allows one to - * {@link GraphOutput.Builder#types(org.graalvm.graphio.GraphTypes) register} an implementation of - * this interface to treat them specially. + * {@link GraphOutput.Builder} allows one to {@link GraphOutput.Builder#types(GraphTypes) register} + * an implementation of this interface to treat them specially. */ public interface GraphTypes { /** diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/ProtocolImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/ProtocolImpl.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/ProtocolImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/ProtocolImpl.java index 53f27972d9d0..88e80e39eea5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/ProtocolImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/ProtocolImpl.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.graphio; +package jdk.compiler.graal.graphio; import java.io.File; import java.io.IOException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/doc-files/diamond.png b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/doc-files/diamond.png similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/doc-files/diamond.png rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/doc-files/diamond.png diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/package-info.java similarity index 64% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/package-info.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/package-info.java index 75c2f4830c8e..2942f7500634 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/graphio/package-info.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/package-info.java @@ -27,23 +27,25 @@ * Send your graphs to IGV via a socket or a file. This package allows one to easily encode * 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 org.graalvm.graphio.GraphOutput} - * specialized for your data is a matter of implementing a single interface: + * nodes and edges among them, creating a + * {@link jdk.compiler.graal.graphio.GraphOutput} specialized for your data is a matter of + * implementing a single interface: * - * {@link org.graalvm.graphio.GraphJavadocSnippets#acmeGraphStructure} + * {@link jdk.compiler.graal.graphio.GraphJavadocSnippets#acmeGraphStructure} * - * The {@link org.graalvm.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 + * The {@link jdk.compiler.graal.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 org.graalvm.graphio.GraphStructure} operations. + * provided by implementing the {@link jdk.compiler.graal.graphio.GraphStructure} operations. *

* The next step is to turn this graph structure into an instance of - * {@link org.graalvm.graphio.GraphOutput}. To do so use the associated - * {@link org.graalvm.graphio.GraphOutput.Builder builder} just like shown in the following method: + * {@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 + * method: * - * {@link org.graalvm.graphio.GraphJavadocSnippets#buildOutput} + * {@link jdk.compiler.graal.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 @@ -51,7 +53,7 @@ * 4445 (the default port IGV listens to) and dump the data there. Here is an * example: * - * {@link org.graalvm.graphio.GraphJavadocSnippets#dump} + * {@link jdk.compiler.graal.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: @@ -65,17 +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 org.graalvm.graphio.GraphBlocks code blocks} information
    • - *
  • {@linkplain org.graalvm.graphio.GraphElements method and fields} information
    • - *
  • Advanced support for {@linkplain org.graalvm.graphio.GraphTypes recognizing types}
    • + *
  • {@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 + * types}
    • *
- * all these additional interfaces ({@link org.graalvm.graphio.GraphBlocks}, - * {@link org.graalvm.graphio.GraphElements} and {@link org.graalvm.graphio.GraphTypes}) are - * optional - they don't have to be provided. As such they can be specified via - * {@link org.graalvm.graphio.GraphOutput.Builder} instance methods, which may, but need not be - * called at all. Here is an example: + * 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 + * methods, which may, but need not be called at all. Here is an example: * - * {@link org.graalvm.graphio.GraphJavadocSnippets#buildAll} + * {@link jdk.compiler.graal.graphio.GraphJavadocSnippets#buildAll} * * All these interfaces follow the * singletonizer API pattern again - e.g. @@ -83,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 org.graalvm.graphio; +package jdk.compiler.graal.graphio; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/CodeBuffer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/CodeBuffer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java index 89d095633024..0f1cb97b9820 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/CodeBuffer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen; +package jdk.compiler.graal.hightiercodegen; import java.io.BufferedOutputStream; import java.io.ByteArrayOutputStream; @@ -32,8 +32,8 @@ import java.nio.file.Path; import java.util.List; -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.nodes.ParameterNode; +import jdk.compiler.graal.core.common.calc.CanonicalCondition; +import jdk.compiler.graal.nodes.ParameterNode; import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/CodeGenTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/CodeGenTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java index c5590071c1d7..98678866a1f3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/CodeGenTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen; +package jdk.compiler.graal.hightiercodegen; import java.lang.reflect.Field; import java.lang.reflect.Method; import java.util.List; -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hightiercodegen.variables.ResolvedVar; -import org.graalvm.compiler.hightiercodegen.variables.VariableAllocation; -import org.graalvm.compiler.hightiercodegen.variables.VariableMap; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; +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.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/Emitter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Emitter.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/Emitter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Emitter.java index 660de43c32b1..fd22d8d0a45e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/Emitter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Emitter.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.hightiercodegen; +package jdk.compiler.graal.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 org.graalvm.compiler.hightiercodegen.variables.ResolvedVar; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.hightiercodegen.variables.ResolvedVar; +import jdk.compiler.graal.nodes.ValueNode; import jdk.vm.ci.meta.ResolvedJavaField; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/IEmitter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/IEmitter.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/IEmitter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/IEmitter.java index 5abb83c2500f..051aab905f1d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/IEmitter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/IEmitter.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.hightiercodegen; +package jdk.compiler.graal.hightiercodegen; /** * Abstract interface to facilitate lowering of various objects. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/Keyword.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Keyword.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/Keyword.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Keyword.java index 1fe7742fa70a..2a2a7fdd57fd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/Keyword.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Keyword.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen; +package jdk.compiler.graal.hightiercodegen; /** * This class represents keywords of a high level programming language. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/NodeLowerer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/NodeLowerer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java index bfa48bd104ab..1af817daa018 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/NodeLowerer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java @@ -22,92 +22,92 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen; - -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.hightiercodegen.variables.ResolvedVar; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeadEndNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.GuardPhiNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.LogicNegationNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.ShortCircuitOrNode; -import org.graalvm.compiler.nodes.UnwindNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValueProxyNode; -import org.graalvm.compiler.nodes.calc.AbsNode; -import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode; -import org.graalvm.compiler.nodes.calc.CompareNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IntegerTestNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.calc.NarrowNode; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.calc.NotNode; -import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.nodes.calc.RoundNode; -import org.graalvm.compiler.nodes.calc.ShiftNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.SignumNode; -import org.graalvm.compiler.nodes.calc.SqrtNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.debug.BlackholeNode; -import org.graalvm.compiler.nodes.extended.BoxNode; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode; -import org.graalvm.compiler.nodes.extended.ForeignCall; -import org.graalvm.compiler.nodes.extended.GetClassNode; -import org.graalvm.compiler.nodes.extended.JavaReadNode; -import org.graalvm.compiler.nodes.extended.JavaWriteNode; -import org.graalvm.compiler.nodes.extended.LoadArrayComponentHubNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.extended.ObjectIsArrayNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.extended.StateSplitProxyNode; -import org.graalvm.compiler.nodes.extended.UnboxNode; -import org.graalvm.compiler.nodes.extended.UnsafeMemoryLoadNode; -import org.graalvm.compiler.nodes.extended.UnsafeMemoryStoreNode; -import org.graalvm.compiler.nodes.java.AbstractUnsafeCompareAndSwapNode; -import org.graalvm.compiler.nodes.java.ArrayLengthNode; -import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode; -import org.graalvm.compiler.nodes.java.AtomicReadAndWriteNode; -import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode; -import org.graalvm.compiler.nodes.java.DynamicNewArrayNode; -import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode; -import org.graalvm.compiler.nodes.java.ExceptionObjectNode; -import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.NewMultiArrayNode; -import org.graalvm.compiler.nodes.java.ReachabilityFenceNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.java.StoreIndexedNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; -import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode; -import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode; -import org.graalvm.compiler.replacements.nodes.IdentityHashCodeNode; -import org.graalvm.compiler.replacements.nodes.ObjectClone; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode; -import org.graalvm.compiler.word.WordCastNode; +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; /** * This class is responsible for generating code for individual {@link Node}s in the graph. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java index b3939411741a..3051c314a980 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BasicBlockInterpreter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.hightiercodegen.irwalk; +package jdk.compiler.graal.hightiercodegen.irwalk; import java.util.ArrayList; import java.util.Arrays; @@ -31,23 +31,23 @@ import java.util.HashMap; import java.util.List; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.LoopEndNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.nodes.java.ExceptionObjectNode; - -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.hightiercodegen.reconstruction.ReconstructionData; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.PrimitiveConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BlockNestingVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BlockNestingVerifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java index bca8dced1d0f..e7561b38525e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BlockNestingVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java @@ -23,7 +23,7 @@ * questions. */ -package org.graalvm.compiler.hightiercodegen.irwalk; +package jdk.compiler.graal.hightiercodegen.irwalk; import java.util.ArrayDeque; import java.util.Deque; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BlockVisitHistory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BlockVisitHistory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java index f03d254e5475..fad84ebf6995 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/BlockVisitHistory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.irwalk; +package jdk.compiler.graal.hightiercodegen.irwalk; import java.util.HashSet; import java.util.Set; -import org.graalvm.compiler.nodes.cfg.HIRBlock; +import jdk.compiler.graal.nodes.cfg.HIRBlock; public class BlockVisitHistory { private final Set visitedBlocks; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/IRWalkVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/IRWalkVerifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java index a1a24579194e..554d92d6383b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/IRWalkVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.irwalk; +package jdk.compiler.graal.hightiercodegen.irwalk; import java.util.List; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.nodes.MergeNode; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.debug.DebugContext; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.nodes.MergeNode; +import jdk.compiler.graal.nodes.StructuredGraph; -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.hightiercodegen.reconstruction.ReconstructionData; +import jdk.compiler.graal.hightiercodegen.CodeGenTool; +import jdk.compiler.graal.hightiercodegen.reconstruction.ReconstructionData; import jdk.vm.ci.common.JVMCIError; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/IRWalker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/IRWalker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java index dfed1ff10ecd..c19a8d4ddfa6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/IRWalker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.irwalk; +package jdk.compiler.graal.hightiercodegen.irwalk; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.hightiercodegen.lowerer.PhiResolveLowerer; -import org.graalvm.compiler.hightiercodegen.reconstruction.ReconstructionData; -import org.graalvm.compiler.nodes.LoopEndNode; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.cfg.HIRBlock; +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; /** * Abstract interface for generating textual control flow in code from a {@link ControlFlowGraph}s. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/StackifierIRWalker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/StackifierIRWalker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java index f912e7656a8b..e8107435ccf5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/irwalk/StackifierIRWalker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java @@ -22,51 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.irwalk; +package jdk.compiler.graal.hightiercodegen.irwalk; import java.util.ArrayList; import java.util.List; import java.util.SortedSet; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.hightiercodegen.reconstruction.ReconstructionData; -import org.graalvm.compiler.hightiercodegen.reconstruction.StackifierData; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.StackifierScopeComputation; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.ControlSinkNode; -import org.graalvm.compiler.nodes.ControlSplitNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.LoopEndNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.WithExceptionNode; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.nodes.java.ExceptionObjectNode; -import org.graalvm.compiler.nodes.java.TypeSwitchNode; -import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode; +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.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/CommitAllocationLowerer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/CommitAllocationLowerer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java index fddb55161fa1..390a232bb9f3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/CommitAllocationLowerer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.lowerer; +package jdk.compiler.graal.hightiercodegen.lowerer; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.hightiercodegen.Emitter; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.nodes.virtual.VirtualArrayNode; -import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; +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.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/MoveResolver.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/MoveResolver.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java index b400cf272061..e49d96e2d4da 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/MoveResolver.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.lowerer; +package jdk.compiler.graal.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 org.graalvm.compiler.nodes.AbstractEndNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.ValuePhiNode; +import jdk.compiler.graal.nodes.AbstractEndNode; +import jdk.compiler.graal.nodes.AbstractMergeNode; +import jdk.compiler.graal.nodes.ValuePhiNode; /** * Schedules a set of moves that are supposed to happen simultaneously as consecutive moves while diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/PhiResolveLowerer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/PhiResolveLowerer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java index d8e457917c47..1017227ff47d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/lowerer/PhiResolveLowerer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.lowerer; +package jdk.compiler.graal.hightiercodegen.lowerer; -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.nodes.AbstractEndNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; +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; /** * Resolves phi's on end node lowering. This component is responsible for scheduling phi-to-phi diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ReconstructionData.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ReconstructionData.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java index d82029d51663..55b790e1f12e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ReconstructionData.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction; +package jdk.compiler.graal.hightiercodegen.reconstruction; -import org.graalvm.compiler.debug.DebugContext; +import jdk.compiler.graal.debug.DebugContext; public interface ReconstructionData { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ReconstructionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ReconstructionPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java index 28aec07322a5..ce545715a050 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ReconstructionPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction; +package jdk.compiler.graal.hightiercodegen.reconstruction; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.BasePhase; +import jdk.compiler.graal.nodes.spi.CoreProviders; +import jdk.compiler.graal.phases.BasePhase; /** * Base class for a phase that performs control-flow reconstruction. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java index d0432e2b4121..2ad6fd73af84 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java @@ -23,9 +23,9 @@ * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction; +package jdk.compiler.graal.hightiercodegen.reconstruction; -import org.graalvm.compiler.nodes.StructuredGraph; +import jdk.compiler.graal.nodes.StructuredGraph; public class ScheduleWithReconstructionResult extends StructuredGraph.ScheduleResult { private final ReconstructionData reconstructionData; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/StackifierData.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/StackifierData.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java index 2700baf0a312..9fb2a83129bc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/StackifierData.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import org.graalvm.compiler.nodes.cfg.HIRBlock; - -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; +import jdk.compiler.graal.graph.Node; +import jdk.compiler.graal.nodes.cfg.HIRBlock; + +import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; +import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; /** * This class contains all the data that is computed by the stackifier algorithm. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java index 671673ff960b..211e4481ded2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hightiercodegen.reconstruction.StackifierData; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.phases.BasePhase; +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; /** * This phase sorts the basic blocks of a {@link ControlFlowGraph} such that the basic blocks from a @@ -197,10 +197,9 @@ private static int getSuccessorCount(HIRBlock current) { } /** - * We need to update the blockToNodesMap in - * {@link org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult} because it internally - * uses an array that uses the basic block id as an index. Since we update the basic block - * indices we also have to update the array. + * We need to update the blockToNodesMap in {@link StructuredGraph.ScheduleResult} because + * it internally uses an array that uses the basic block id as an index. Since we update the + * basic block indices we also have to update the array. */ @SuppressWarnings("unchecked") private void updateIds() { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java index a507cbd6fbf3..31f85af9698c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier; import java.util.Optional; -import org.graalvm.compiler.hightiercodegen.irwalk.StackifierIRWalker; -import org.graalvm.compiler.hightiercodegen.reconstruction.ReconstructionPhase; -import org.graalvm.compiler.hightiercodegen.reconstruction.ScheduleWithReconstructionResult; -import org.graalvm.compiler.hightiercodegen.reconstruction.StackifierData; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlockGeneration; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.schedule.SchedulePhase; +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; /** * Computes a {@link ScheduleWithReconstructionResult} for the graph, meant specifically for use by diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java index 76e9c1c8510d..ddd4c4942eea 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hightiercodegen.reconstruction.StackifierData; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks.LabeledBlock; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.WithExceptionNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; +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; /** * This class computes {@link Scope}s for then-else branches, catch-blocks and cases of a switch diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java index e6664af22ea9..b01e5b0fc468 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks; -import org.graalvm.compiler.nodes.cfg.HIRBlock; +import jdk.compiler.graal.nodes.cfg.HIRBlock; /** * This class represents labeled blocks in the generated code. They are used to replace goto diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java index 89e1fdffffd7..c1aeb166a55d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.blocks; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.blocks; -import static org.graalvm.compiler.debug.Assertions.assertionsEnabled; +import static jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hightiercodegen.irwalk.StackifierIRWalker; -import org.graalvm.compiler.hightiercodegen.reconstruction.StackifierData; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.CatchScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.IfScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.LoopScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.Scope; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.ScopeContainer; -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes.SwitchScopeContainer; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.cfg.ControlFlowGraph; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; +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; /** * This class generates {@link LabeledBlock}s that enable us to do forward jumps and skip over basic diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java index 3190697ce55a..6a3610796ede 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java @@ -22,11 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; + +import jdk.compiler.graal.nodes.InvokeWithExceptionNode; /** * This class is a container for the catch scope that is generated by an - * {@link org.graalvm.compiler.nodes.InvokeWithExceptionNode}. + * {@link InvokeWithExceptionNode}. */ public class CatchScopeContainer implements ScopeContainer { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java index 24e97fbcc276..9d950f8b7958 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java @@ -22,11 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; + +import jdk.compiler.graal.nodes.IfNode; /** - * This class is a container for the then- and else-scopes that are generated by an - * {@link org.graalvm.compiler.nodes.IfNode}. + * This class is a container for the then- and else-scopes that are generated by an {@link IfNode}. */ public class IfScopeContainer implements ScopeContainer { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java index 4142b15fa21f..fc98b8f46146 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java @@ -22,11 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; + +import jdk.compiler.graal.nodes.LoopBeginNode; /** - * This class is a container for a loop that is generated by a - * {@link org.graalvm.compiler.nodes.LoopBeginNode}. + * This class is a container for a loop that is generated by a {@link LoopBeginNode}. */ public class LoopScopeContainer implements ScopeContainer { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/Scope.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/Scope.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java index bf9591ed3c44..40b78b865464 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/Scope.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java @@ -22,16 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; import java.util.Arrays; import java.util.Comparator; +import jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.nodes.cfg.HIRBlock; - -import org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.CFStackifierSortPhase; +import jdk.compiler.graal.core.common.cfg.BasicBlock; +import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java index d9720b94b94f..f72be3d544d2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; /** * This interface is implemented by classes that hold scopes. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java index 4bb5999263ce..e983f6dfbb30 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java @@ -22,11 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.reconstruction.stackifier.scopes; +package jdk.compiler.graal.hightiercodegen.reconstruction.stackifier.scopes; + +import jdk.compiler.graal.nodes.extended.IntegerSwitchNode; /** - * This class contains scopes for the cases of a - * {@link org.graalvm.compiler.nodes.extended.IntegerSwitchNode}. + * This class contains scopes for the cases of a {@link IntegerSwitchNode}. */ public class SwitchScopeContainer implements ScopeContainer { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/ResolvedVar.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/ResolvedVar.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java index c335506fba60..543d355e7e12 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/ResolvedVar.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.variables; +package jdk.compiler.graal.hightiercodegen.variables; -import org.graalvm.compiler.graph.Node; +import jdk.compiler.graal.graph.Node; import jdk.vm.ci.common.JVMCIError; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/VariableAllocation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/VariableAllocation.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java index c519cfd7afb7..0b327f392de3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/VariableAllocation.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java @@ -23,28 +23,28 @@ * questions. */ -package org.graalvm.compiler.hightiercodegen.variables; +package jdk.compiler.graal.hightiercodegen.variables; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.hightiercodegen.CodeGenTool; -import org.graalvm.compiler.hightiercodegen.NodeLowerer; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; +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; /** * Performs variable allocation on SSA form. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/VariableMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/VariableMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java index 852eef32d240..d00480528595 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hightiercodegen/variables/VariableMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hightiercodegen.variables; +package jdk.compiler.graal.hightiercodegen.variables; import java.util.HashMap; -import org.graalvm.compiler.nodes.ValueNode; +import jdk.compiler.graal.nodes.ValueNode; /** * Storing variable allocation result for a method. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java index b34a4ffd64fc..bdf4b25ff177 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/BootstrapWatchDog.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java @@ -22,22 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; - -import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +package jdk.compiler.graal.hotspot; import java.util.Arrays; import java.util.HashMap; import java.util.Map; import java.util.concurrent.atomic.AtomicInteger; -import org.graalvm.compiler.core.CompilationWatchDog; -import org.graalvm.compiler.core.common.util.Util; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.CompilationRequest; import jdk.vm.ci.services.Services; @@ -156,7 +154,7 @@ public void run() { TTY.printf("%nAfter %.2f seconds bootstrapping, compilation rate is %.2f compilations per second " + "which is below %.2f times the max compilation rate of %.2f%n", seconds(elapsed), rate, maxRateDecrease, maxRate); TTY.printf("To enable monitoring of long running individual compilations, re-run with -D%s%s=%.2f%n", - GRAAL_OPTION_PROPERTY_PREFIX, CompilationWatchDog.Options.CompilationWatchDogStartDelay.getName(), + HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX, CompilationWatchDog.Options.CompilationWatchDogStartDelay.getName(), seconds(elapsed) - 5); hitCriticalRateOrTimeout = true; return; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CommunityCompilerConfigurationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CommunityCompilerConfigurationFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java index 39e069f3d21f..87536dc47a35 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CommunityCompilerConfigurationFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.Instrumentation; -import org.graalvm.compiler.core.phases.CommunityCompilerConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +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; /** * Factory for creating the default configuration for the community edition of Graal. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationContext.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationContext.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationContext.java index a4baf4d9563d..4606d1349661 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationContext.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationContext.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationCounters.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationCounters.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationCounters.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationCounters.java index ceb67badabca..4d86671cf172 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationCounters.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationCounters.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.util.Comparator; import java.util.HashMap; @@ -31,12 +31,12 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.graalvm.compiler.core.common.util.MethodKey; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.CompilationRequest; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationStatistics.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationStatistics.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationStatistics.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationStatistics.java index 14409de67fe5..24addc2c5fc8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationStatistics.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationStatistics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.io.FileNotFoundException; import java.io.FileOutputStream; @@ -40,11 +40,11 @@ import java.util.Locale; import java.util.concurrent.ConcurrentLinkedDeque; -import org.graalvm.compiler.debug.CSVUtil; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.GraalServices; +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.vm.ci.hotspot.HotSpotInstalledCode; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationTask.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationTask.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationTask.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationTask.java index 8c717f20125f..4f54217b2a20 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilationTask.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationTask.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static org.graalvm.compiler.core.CompilationWrapper.ExceptionAction.Diagnose; -import static org.graalvm.compiler.core.CompilationWrapper.ExceptionAction.ExitVM; -import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationBailoutAsFailure; -import static org.graalvm.compiler.core.GraalCompilerOptions.CompilationFailureAction; -import static org.graalvm.compiler.core.phases.HighTier.Options.Inline; -import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing; +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 java.io.PrintStream; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.CompilationPrinter; -import org.graalvm.compiler.core.CompilationWatchDog; -import org.graalvm.compiler.core.CompilationWrapper; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugContext.Description; -import org.graalvm.compiler.debug.DebugDumpScope; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.debug.TimerKey; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.StableProfileProvider; -import org.graalvm.compiler.nodes.spi.StableProfileProvider.TypeFilter; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; -import org.graalvm.compiler.serviceprovider.GraalServices; +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.vm.ci.code.BailoutException; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java index 43f127717068..dd4838eb1951 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.io.ByteArrayOutputStream; import java.io.IOException; @@ -30,11 +30,11 @@ import java.nio.file.Files; import java.nio.file.Paths; -import org.graalvm.compiler.core.common.CancellationBailoutException; -import org.graalvm.compiler.core.phases.fuzzing.FuzzedSuites; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.meta.HotSpotFuzzedSuitesProvider; +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.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.hotspot.HotSpotCompilationRequestResult; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java index fed9e284ab02..b7e491214494 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/CompilerConfigurationFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.common.InitTimer.timer; @@ -33,20 +33,20 @@ import java.util.stream.Collectors; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.core.Instrumentation; -import org.graalvm.compiler.core.common.SuppressFBWarnings; -import org.graalvm.compiler.core.common.util.PhasePlan; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.options.EnumOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionStability; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.serviceprovider.GlobalAtomicLong; -import org.graalvm.compiler.serviceprovider.GraalServices; +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.vm.ci.code.Architecture; import jdk.vm.ci.common.InitTimer; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/DefaultInstrumentation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/DefaultInstrumentation.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java index ad9de3aafaf3..673ba959d7d5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/DefaultInstrumentation.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.Instrumentation; +import jdk.compiler.graal.core.Instrumentation; /** * Default version of {@link Instrumentation}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java index 7bcfe218f7a7..ea5047d58717 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/EconomyCompilerConfigurationFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.Instrumentation; -import org.graalvm.compiler.core.phases.EconomyCompilerConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +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; /** * Factory that creates a {@link EconomyCompilerConfiguration}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/EncodedSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EncodedSnippets.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/EncodedSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EncodedSnippets.java index 2c6e61656c84..87a2d7f05bff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/EncodedSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EncodedSnippets.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.runtime.JVMCI.getRuntime; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static org.graalvm.compiler.hotspot.HotSpotReplacementsImpl.isGraalClass; -import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; +import static jdk.compiler.graal.hotspot.HotSpotReplacementsImpl.isGraalClass; +import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; -import org.graalvm.compiler.api.runtime.GraalRuntime; -import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.core.common.type.SymbolicJVMCIReference; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.EncodedGraph; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin; -import org.graalvm.compiler.replacements.PEGraphDecoder; -import org.graalvm.compiler.replacements.PartialIntrinsicCallTargetNode; +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.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java index 4abca87cdf2a..851ec4fd6cd1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfig.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.List; import java.util.Map; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.hotspot.HotSpotVMConfigStore; @@ -668,7 +668,7 @@ private void populateMarkConstants() { if (markId == HotSpotMarkId.ENTRY_BARRIER_PATCH) { continue; } - GraalHotSpotVMConfigAccess.reportError("Unsupported Mark " + markId); + reportError("Unsupported Mark " + markId); } markId.setValue(result.intValue()); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java index 9cc047467baa..4968845117b0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/GraalHotSpotVMConfigAccess.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.services.Services.getSavedProperty; @@ -36,8 +36,7 @@ import java.util.Set; import java.util.stream.Collectors; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.hotspot.JVMCIVersionCheck.Version; +import jdk.compiler.graal.debug.Assertions; import jdk.vm.ci.common.JVMCIError; import jdk.vm.ci.hotspot.HotSpotVMConfigAccess; @@ -101,27 +100,27 @@ public HotSpotVMConfigStore getStore() { public static final Set KNOWN_OS_NAMES = new HashSet<>(Arrays.asList("windows", "linux", "darwin")); /** - * Name for current OS. Will be a value in {@value #KNOWN_OS_NAMES}. + * Name for current OS. Will be a value in {@link #KNOWN_OS_NAMES}. */ public final String osName; /** - * Name for current CPU architecture. Will be a value in {@value #KNOWN_ARCHITECTURES}. + * Name for current CPU architecture. Will be a value in {@link #KNOWN_ARCHITECTURES}. */ public final String osArch; - public static boolean jvmciGE(Version v) { + public static boolean jvmciGE(JVMCIVersionCheck.Version v) { return JVMCI && !JVMCI_VERSION.isLessThan(v); } public static final int JDK = Runtime.version().feature(); public static final int JDK_BUILD = Runtime.version().build().orElse(0); - public static final Version JVMCI_VERSION; + public static final JVMCIVersionCheck.Version JVMCI_VERSION; public static final boolean JVMCI; public static final boolean JDK_PRERELEASE; static { String vmVersion = getSavedProperty("java.vm.version"); - JVMCI_VERSION = Version.parse(vmVersion); + JVMCI_VERSION = JVMCIVersionCheck.Version.parse(vmVersion); JDK_PRERELEASE = vmVersion.contains("SNAPSHOT") || vmVersion.contains("-dev"); JVMCI = JVMCI_VERSION != null; } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBackend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackend.java similarity index 65% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBackend.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackend.java index 5564bd7f5d08..27ead931f2ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBackend.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackend.java @@ -22,61 +22,55 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; - -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.UNSAFE_ARRAYCOPY; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; import org.graalvm.collections.MapCursor; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.VMErrorNode; -import org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.StandardOp.LabelOp; -import org.graalvm.compiler.lir.StandardOp.RestoreRegistersOp; -import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp; -import org.graalvm.compiler.lir.ValueConsumer; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.UnwindNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.SuitesProvider; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.WordBase; @@ -113,36 +107,43 @@ public static class Options { * Descriptor for {@link ExceptionHandlerStub}. This stub is called by the * {@linkplain HotSpotMarkId#EXCEPTION_HANDLER_ENTRY exception handler} in a compiled method. */ - public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "exceptionHandler", void.class, Object.class, + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "exceptionHandler", void.class, Object.class, Word.class); /** * Descriptor for SharedRuntime::get_ic_miss_stub(). */ - public static final HotSpotForeignCallDescriptor IC_MISS_HANDLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "icMissHandler", void.class); + public static final HotSpotForeignCallDescriptor IC_MISS_HANDLER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "icMissHandler", void.class); /** * Descriptor for {@link UnwindExceptionToCallerStub}. This stub is called by code generated * from {@link UnwindNode}. */ - public static final HotSpotForeignCallDescriptor UNWIND_EXCEPTION_TO_CALLER = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), "unwindExceptionToCaller", void.class, + public static final HotSpotForeignCallDescriptor UNWIND_EXCEPTION_TO_CALLER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "unwindExceptionToCaller", void.class, Object.class, Word.class); /** * Descriptor for the arguments when unwinding to an exception handler in a caller. */ - public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_IN_CALLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "exceptionHandlerInCaller", + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_IN_CALLER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "exceptionHandlerInCaller", void.class, Object.class, Word.class); private final HotSpotGraalRuntimeProvider runtime; - public static final HotSpotForeignCallDescriptor MONTGOMERY_MULTIPLY = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), + public static final HotSpotForeignCallDescriptor MONTGOMERY_MULTIPLY = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), "implMontgomeryMultiply", void.class, Word.class, Word.class, Word.class, int.class, long.class, Word.class); - public static final HotSpotForeignCallDescriptor MONTGOMERY_SQUARE = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), + public static final HotSpotForeignCallDescriptor MONTGOMERY_SQUARE = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NamedLocationIdentity.getArrayLocation(JavaKind.Int), "implMontgomerySquare", void.class, Word.class, Word.class, int.class, long.class, Word.class); - public static final HotSpotForeignCallDescriptor MD5_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "md5ImplCompress", int.class, Word.class, + public static final HotSpotForeignCallDescriptor MD5_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "md5ImplCompress", int.class, Word.class, Object.class, int.class, int.class); public static int md5ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { @@ -152,7 +153,8 @@ public static int md5ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, @NodeIntrinsic(ForeignCallNode.class) private static native int md5ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit); - public static final HotSpotForeignCallDescriptor SHA_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "shaImplCompressMB", int.class, Word.class, + public static final HotSpotForeignCallDescriptor SHA_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "shaImplCompressMB", int.class, Word.class, Object.class, int.class, int.class); public static int shaImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { @@ -162,7 +164,8 @@ public static int shaImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, @NodeIntrinsic(ForeignCallNode.class) private static native int shaImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit); - public static final HotSpotForeignCallDescriptor SHA2_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha2ImplCompressMB", int.class, Word.class, + public static final HotSpotForeignCallDescriptor SHA2_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "sha2ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class); public static int sha2ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { @@ -172,7 +175,8 @@ public static int sha2ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs @NodeIntrinsic(ForeignCallNode.class) private static native int sha2ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit); - public static final HotSpotForeignCallDescriptor SHA5_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha5ImplCompressMB", int.class, Word.class, + public static final HotSpotForeignCallDescriptor SHA5_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "sha5ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class); public static int sha5ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs, int limit) { @@ -182,7 +186,8 @@ public static int sha5ImplCompressMBStub(Word bufAddr, Object stateAddr, int ofs @NodeIntrinsic(ForeignCallNode.class) private static native int sha5ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int ofs, int limit); - public static final HotSpotForeignCallDescriptor SHA3_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "sha3ImplCompressMB", int.class, Word.class, + public static final HotSpotForeignCallDescriptor SHA3_IMPL_COMPRESS_MB = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "sha3ImplCompressMB", int.class, Word.class, Object.class, int.class, int.class, int.class); public static int sha3ImplCompressMBStub(Word bufAddr, Object stateAddr, int blockSize, int ofs, int limit) { @@ -193,7 +198,7 @@ public static int sha3ImplCompressMBStub(Word bufAddr, Object stateAddr, int blo private static native int sha3ImplCompressMBStub(@ConstantNodeParameter ForeignCallDescriptor descriptor, Word bufAddr, Object state, int blockSize, int ofs, int limit); public static void unsafeArraycopy(Word srcAddr, Word dstAddr, Word size) { - unsafeArraycopyStub(UNSAFE_ARRAYCOPY, srcAddr, dstAddr, size); + unsafeArraycopyStub(HotSpotHostForeignCallsProvider.UNSAFE_ARRAYCOPY, srcAddr, dstAddr, size); } @NodeIntrinsic(ForeignCallNode.class) @@ -202,106 +207,129 @@ public static void unsafeArraycopy(Word srcAddr, Word dstAddr, Word size) { /** * Descriptor for {@code StubRoutines::_base64_encodeBlock}. */ - public static final HotSpotForeignCallDescriptor BASE64_ENCODE_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "base64EncodeBlock", void.class, Word.class, + public static final HotSpotForeignCallDescriptor BASE64_ENCODE_BLOCK = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "base64EncodeBlock", void.class, Word.class, int.class, int.class, Word.class, int.class, boolean.class); /** * Descriptor for {@code StubRoutines::_base64_decodeBlock}. */ - public static final HotSpotForeignCallDescriptor BASE64_DECODE_BLOCK = new HotSpotForeignCallDescriptor(LEAF, NOT_REEXECUTABLE, any(), "base64DecodeBlock", int.class, Word.class, + public static final HotSpotForeignCallDescriptor BASE64_DECODE_BLOCK = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "base64DecodeBlock", int.class, Word.class, int.class, int.class, Word.class, int.class, boolean.class, boolean.class); public static final LocationIdentity CRC_TABLE_LOCATION = NamedLocationIdentity.immutable("crc32_table"); - public static final HotSpotForeignCallDescriptor UPDATE_BYTES_CRC32 = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "updateBytesCRC32", int.class, int.class, + public static final HotSpotForeignCallDescriptor UPDATE_BYTES_CRC32 = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "updateBytesCRC32", int.class, int.class, WordBase.class, int.class); - public static final HotSpotForeignCallDescriptor UPDATE_BYTES_CRC32C = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "updateBytesCRC32C", int.class, int.class, + public static final HotSpotForeignCallDescriptor UPDATE_BYTES_CRC32C = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "updateBytesCRC32C", int.class, int.class, WordBase.class, int.class); - public static final HotSpotForeignCallDescriptor UPDATE_BYTES_ADLER32 = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "updateBytesAdler32", int.class, int.class, + public static final HotSpotForeignCallDescriptor UPDATE_BYTES_ADLER32 = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "updateBytesAdler32", int.class, int.class, WordBase.class, int.class); - public static final HotSpotForeignCallDescriptor BIGINTEGER_LEFT_SHIFT_WORKER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "bigIntegerLeftShiftWorker", void.class, + public static final HotSpotForeignCallDescriptor BIGINTEGER_LEFT_SHIFT_WORKER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "bigIntegerLeftShiftWorker", void.class, WordBase.class, WordBase.class, int.class, int.class, int.class); - public static final HotSpotForeignCallDescriptor BIGINTEGER_RIGHT_SHIFT_WORKER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "bigIntegerRightShiftWorker", void.class, + public static final HotSpotForeignCallDescriptor BIGINTEGER_RIGHT_SHIFT_WORKER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "bigIntegerRightShiftWorker", void.class, WordBase.class, WordBase.class, int.class, int.class, int.class); - public static final HotSpotForeignCallDescriptor ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), + public static final HotSpotForeignCallDescriptor ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "_electronicCodeBook_encryptAESCrypt", int.class, WordBase.class, WordBase.class, WordBase.class, int.class); - public static final HotSpotForeignCallDescriptor ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), + public static final HotSpotForeignCallDescriptor ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "_electronicCodeBook_decryptAESCrypt", int.class, WordBase.class, WordBase.class, WordBase.class, int.class); - public static final HotSpotForeignCallDescriptor GALOIS_COUNTER_MODE_CRYPT = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "_galoisCounterMode_AESCrypt", int.class, + public static final HotSpotForeignCallDescriptor GALOIS_COUNTER_MODE_CRYPT = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "_galoisCounterMode_AESCrypt", int.class, WordBase.class, int.class, WordBase.class, WordBase.class, WordBase.class, WordBase.class, WordBase.class, WordBase.class); - public static final HotSpotForeignCallDescriptor POLY1305_PROCESSBLOCKS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "_poly1305_processBlocks", int.class, + public static final HotSpotForeignCallDescriptor POLY1305_PROCESSBLOCKS = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "_poly1305_processBlocks", int.class, WordBase.class, int.class, WordBase.class, WordBase.class); - public static final HotSpotForeignCallDescriptor CHACHA20Block = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "_chacha20Block", int.class, + public static final HotSpotForeignCallDescriptor CHACHA20Block = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "_chacha20Block", int.class, WordBase.class, WordBase.class); - public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), + public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "notify_jvmti_vthread_start", void.class, Object.class, boolean.class, Word.class); - public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), + public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "notify_jvmti_vthread_end", void.class, Object.class, boolean.class, Word.class); - public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), + public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "notify_jvmti_vthread_mount", void.class, Object.class, boolean.class, Word.class); - public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, any(), + public static final HotSpotForeignCallDescriptor SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "notify_jvmti_vthread_unmount", void.class, Object.class, boolean.class, Word.class); /** * @see VMErrorNode */ - public static final HotSpotForeignCallDescriptor VM_ERROR = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "vm_error", void.class, Object.class, Object.class, + public static final HotSpotForeignCallDescriptor VM_ERROR = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "vm_error", void.class, Object.class, Object.class, long.class); - private static final LocationIdentity[] TLAB_LOCATIONS = new LocationIdentity[]{TLAB_TOP_LOCATION, TLAB_END_LOCATION}; + private static final LocationIdentity[] TLAB_LOCATIONS = new LocationIdentity[]{HotSpotReplacementsUtil.TLAB_TOP_LOCATION, HotSpotReplacementsUtil.TLAB_END_LOCATION}; /** * New multi array stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final HotSpotForeignCallDescriptor NEW_MULTI_ARRAY = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_multi_array", Object.class, KlassPointer.class, + public static final HotSpotForeignCallDescriptor NEW_MULTI_ARRAY = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, TLAB_LOCATIONS, "new_multi_array", Object.class, KlassPointer.class, int.class, Word.class); /** * New multi array stub that will return null on allocation failure. */ - public static final HotSpotForeignCallDescriptor NEW_MULTI_ARRAY_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_multi_array_or_null", Object.class, + public static final HotSpotForeignCallDescriptor NEW_MULTI_ARRAY_OR_NULL = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, TLAB_LOCATIONS, "new_multi_array_or_null", Object.class, KlassPointer.class, int.class, Word.class); /** * New array stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final HotSpotForeignCallDescriptor NEW_ARRAY = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_array", Object.class, KlassPointer.class, int.class); + public static final HotSpotForeignCallDescriptor NEW_ARRAY = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, TLAB_LOCATIONS, "new_array", Object.class, KlassPointer.class, int.class); /** * New array stub that will return null on allocation failure. */ - public static final HotSpotForeignCallDescriptor NEW_ARRAY_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_array_or_null", Object.class, + public static final HotSpotForeignCallDescriptor NEW_ARRAY_OR_NULL = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, TLAB_LOCATIONS, "new_array_or_null", Object.class, KlassPointer.class, int.class); /** * New instance stub that throws an {@link OutOfMemoryError} on allocation failure. */ - public static final HotSpotForeignCallDescriptor NEW_INSTANCE = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_instance", Object.class, KlassPointer.class); + public static final HotSpotForeignCallDescriptor NEW_INSTANCE = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, TLAB_LOCATIONS, "new_instance", Object.class, KlassPointer.class); /** * New instance stub that will return null on allocation failure. */ - public static final HotSpotForeignCallDescriptor NEW_INSTANCE_OR_NULL = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, TLAB_LOCATIONS, "new_instance_or_null", Object.class, + public static final HotSpotForeignCallDescriptor NEW_INSTANCE_OR_NULL = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, TLAB_LOCATIONS, "new_instance_or_null", Object.class, KlassPointer.class); public HotSpotBackend(HotSpotGraalRuntimeProvider runtime, HotSpotProviders providers) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java index 3828535e4b87..d7e211ed5b47 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBackendFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java @@ -22,42 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.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 org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.meta.HotSpotGraalConstantFieldProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotStampProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.ArrayRangeWrite; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.gc.CardTableBarrierSet; -import org.graalvm.compiler.nodes.gc.G1BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.java.AbstractNewObjectNode; -import org.graalvm.compiler.nodes.loop.LoopsDataProviderImpl; -import org.graalvm.compiler.nodes.memory.FixedAccessNode; -import org.graalvm.compiler.nodes.spi.LoopsDataProvider; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecodeProvider; +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.vm.ci.code.Architecture; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBytecodeParser.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBytecodeParser.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java index 81720dffedb9..eaef8805d587 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotBytecodeParser.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.java.BytecodeParser; -import org.graalvm.compiler.java.GraphBuilderPhase.Instance; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; +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.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java index 037599a14903..fb6053fdc262 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCodeCacheListener.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import jdk.vm.ci.code.CompiledCode; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java index e665f2944dca..e75a3524a37e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCompilationIdentifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.CompilationRequestIdentifier; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.CompilationIdentifier; +import jdk.compiler.graal.core.common.CompilationRequestIdentifier; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.hotspot.HotSpotCompilationRequest; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java index f318dad2bd70..fcedde315532 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCompiledCodeBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static java.util.Collections.emptyList; import static java.util.Collections.unmodifiableList; -import static org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder.Options.ShowSubstitutionSourceInfo; -import static org.graalvm.util.CollectionsUtil.anyMatch; +import static jdk.compiler.graal.hotspot.HotSpotCompiledCodeBuilder.Options.ShowSubstitutionSourceInfo; +import static jdk.compiler.graal.util.CollectionsUtil.anyMatch; import java.nio.ByteBuffer; import java.nio.ByteOrder; @@ -39,18 +39,18 @@ import java.util.ListIterator; import java.util.Map; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.CompilationResult.CodeAnnotation; -import org.graalvm.compiler.code.CompilationResult.CodeComment; -import org.graalvm.compiler.code.CompilationResult.CodeMark; -import org.graalvm.compiler.code.CompilationResult.JumpTable; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.code.SourceMapping; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java index dbfd048a36b8..296818fb36f5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotCounterOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; -import static org.graalvm.compiler.nodes.debug.DynamicCounterNode.MAX_INCREMENT; -import static org.graalvm.compiler.nodes.debug.DynamicCounterNode.MIN_INCREMENT; +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 java.util.Arrays; +import jdk.compiler.graal.hotspot.meta.HotSpotRegistersProvider; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.asm.Assembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; +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.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java index f763547402da..ef8f4ed9fb72 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotDataBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.hotspot.HotSpotCompressedNullConstant.COMPRESSED_NULL; import java.nio.ByteBuffer; -import org.graalvm.compiler.code.DataSection.Data; -import org.graalvm.compiler.code.DataSection.Patches; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.asm.DataBuilder; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java index 0380bd436e2f..2b3b3a649911 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotDebugInfoBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.gen.DebugInfoBuilder; -import org.graalvm.compiler.graph.GraalGraphError; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.ForeignCall; -import org.graalvm.compiler.nodes.spi.NodeValueMap; -import org.graalvm.compiler.nodes.spi.NodeWithState; +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.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.StackLockValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java index 54807944bcb9..8d3f5ed4372b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkage.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.stubs.Stub; +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.vm.ci.meta.InvokeTarget; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java index 191a8e6a947c..d2afd2427aa3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotForeignCallLinkageImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java @@ -22,19 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; +import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor; +import jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProvider; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CallingConvention.Type; @@ -318,7 +317,7 @@ public CodeInfo(long start, EconomicSet killedRegisters) { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_org_graalvm_compiler_hotspot_HotSpotForeignCallLinkageImpl}. + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotForeignCallLinkageImpl}. */ private static CodeInfo getCodeInfo(Stub stub, Backend backend) { return new CodeInfo(stub.getCode(backend).getStart(), stub.getDestroyedCallerRegisters()); @@ -354,7 +353,7 @@ public long getAddress() { @Override public boolean destroysRegisters() { - return effect == DESTROYS_ALL_CALLER_SAVE_REGISTERS; + return effect == RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; } @Override diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java index 2ba69d661f73..721ea44a5261 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalCompiler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java @@ -22,44 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import static org.graalvm.compiler.core.common.GraalOptions.OptAssumptions; +import static jdk.compiler.graal.core.common.GraalOptions.OptAssumptions; import java.util.Collections; import java.util.List; -import org.graalvm.compiler.api.runtime.GraalJVMCICompiler; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.CompilationWatchDog; -import org.graalvm.compiler.core.GraalCompiler; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Activation; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.hotspot.CompilationCounters.Options; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime.HotSpotGC; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.phases.OnStackReplacementPhase; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.java.StableMethodNameFormatter; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.Cancellable; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.spi.ProfileProvider; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.OptimisticOptimizations.Optimization; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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.vm.ci.code.CompilationRequest; import jdk.vm.ci.code.CompilationRequestResult; @@ -89,7 +88,7 @@ public class HotSpotGraalCompiler implements GraalJVMCICompiler, Cancellable, JV this.jvmciRuntime = jvmciRuntime; this.graalRuntime = graalRuntime; // It is sufficient to have one compilation counter object per compiler object. - this.compilationCounters = Options.CompilationCountLimit.getValue(options) > 0 ? new CompilationCounters(options) : null; + this.compilationCounters = CompilationCounters.Options.CompilationCountLimit.getValue(options) > 0 ? new CompilationCounters(options) : null; this.bootstrapWatchDog = graalRuntime.isBootstrapping() && !DebugOptions.BootstrapInitializeOnly.getValue(options) ? BootstrapWatchDog.maybeCreate(graalRuntime) : null; } @@ -112,7 +111,7 @@ public CompilationRequestResult compileMethod(CompilationRequest request) { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_org_graalvm_compiler_hotspot_HotSpotGraalCompiler} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_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.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java index f1e17b686946..af3404b15a8b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalCompilerFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.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 org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; import java.io.PrintStream; -import org.graalvm.compiler.api.runtime.GraalRuntime; -import org.graalvm.compiler.debug.MethodFilter; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; +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.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("org.graalvm.compiler.hotspot.HotSpotGraalCompilerFactory"); + assert HotSpotGraalCompilerFactory.class.getName().equals("jdk.compiler.graal.hotspot.HotSpotGraalCompilerFactory"); } private CompilationLevel adjustCompilationLevelInternal(Class declaringClass, CompilationLevel level) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java index 340bfecc41f2..416280ce43a7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalJVMCIServiceLocator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +import jdk.compiler.graal.serviceprovider.ServiceProvider; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.hotspot.HotSpotVMEventListener; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java index 95a39d9b88b1..dcb29afdad3f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalOptionValues.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.common.InitTimer.timer; @@ -33,11 +33,11 @@ import java.util.Properties; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionDescriptors; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.options.OptionsParser; +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.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_org_graalvm_compiler_hotspot_HotSpotGraalOptionValues} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_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.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java index 04b51caa70ef..bfa17308cc39 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntime.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.common.InitTimer.timer; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; -import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining; +import static jdk.compiler.graal.core.common.GraalOptions.HotSpotPrintInlining; import java.io.PrintStream; import java.util.ArrayList; @@ -34,37 +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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.api.runtime.GraalRuntime; -import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction; -import org.graalvm.compiler.core.Instrumentation; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.CompilationListenerProfiler; -import org.graalvm.compiler.core.common.CompilerProfiler; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugContext.Description; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.DiagnosticsOutputDirectory; -import org.graalvm.compiler.debug.GlobalMetrics; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.hotspot.CompilationStatistics.Options; -import org.graalvm.compiler.hotspot.CompilerConfigurationFactory.BackendMap; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.spi.StampProvider; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.replacements.SnippetCounter; -import org.graalvm.compiler.replacements.SnippetCounter.Group; -import org.graalvm.compiler.runtime.RuntimeProvider; -import org.graalvm.compiler.serviceprovider.GraalServices; +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.vm.ci.code.Architecture; import jdk.vm.ci.code.stack.StackIntrospection; @@ -144,7 +142,7 @@ public GlobalMetrics getMetricValues() { this.instrumentation = compilerConfigurationFactory.createInstrumentation(options); - BackendMap backendMap = compilerConfigurationFactory.createBackendMap(); + CompilerConfigurationFactory.BackendMap backendMap = compilerConfigurationFactory.createBackendMap(); JVMCIBackend hostJvmciBackend = jvmciRuntime.getHostJVMCIBackend(); Architecture hostArchitecture = hostJvmciBackend.getTarget().arch; @@ -375,7 +373,7 @@ public Instrumentation getInstrumentation() { * @param phase the execution phase being entered */ void phaseTransition(String phase) { - if (Options.UseCompilationStatistics.getValue(options)) { + if (CompilationStatistics.Options.UseCompilationStatistics.getValue(options)) { CompilationStatistics.clear(phase); } } @@ -421,7 +419,7 @@ synchronized void shutdown() { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_org_graalvm_compiler_hotspot_HotSpotGraalRuntime} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotGraalRuntime} * to notify {@code org.graalvm.libgraal.LibGraalIsolate} and call * {@code org.graalvm.nativeimage.VMRuntime.initialize()}. */ @@ -431,7 +429,7 @@ private static void startupLibGraal(HotSpotGraalRuntime runtime) { /** * Substituted by - * {@code com.oracle.svm.graal.hotspot.libgraal.Target_org_graalvm_compiler_hotspot_HotSpotGraalRuntime} + * {@code com.oracle.svm.graal.hotspot.libgraal.Target_jdk_compiler_graal_hotspot_HotSpotGraalRuntime} * to notify {@code org.graalvm.libgraal.LibGraalIsolate} and call * {@code org.graalvm.nativeimage.VMRuntime.shutdown()}. */ diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java index 4cef012998e6..82bb043e0f05 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalRuntimeProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.io.PrintStream; import java.util.Map; -import org.graalvm.compiler.api.runtime.GraalRuntime; -import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction; -import org.graalvm.compiler.core.Instrumentation; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.DiagnosticsOutputDirectory; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetCounter.Group; -import org.graalvm.compiler.runtime.RuntimeProvider; +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.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalServices.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalServices.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java index 63ffb2d2e981..d4195bc509ce 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalServices.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java index 6c11a14dad50..44d733b7d1c9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraalVMEventListener.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.serviceprovider.GraalServices; +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.vm.ci.code.CompiledCode; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraphBuilderInstance.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraphBuilderInstance.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java index 8cf4b91b7a39..036806bba58e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraphBuilderInstance.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.java.BytecodeParser; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraphBuilderPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraphBuilderPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java index 00a3c95d987b..90695192092f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotGraphBuilderPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.OptimisticOptimizations; +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; public class HotSpotGraphBuilderPhase extends GraphBuilderPhase { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java index 6ba0e1a51626..a1d708cd41d1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotHostBackend.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java @@ -22,36 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.code.CodeUtil.K; import static jdk.vm.ci.code.CodeUtil.getCallingConvention; import static jdk.vm.ci.common.InitTimer.timer; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; import java.util.Collections; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.gen.LIRGenerationProvider; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.RegisterConfig; @@ -70,30 +68,36 @@ public abstract class HotSpotHostBackend extends HotSpotBackend implements LIRGe /** * Descriptor for {@code SharedRuntime::deopt_blob()->unpack()}. */ - public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNPACK = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "deopt_blob()->unpack()", void.class); + public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNPACK = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "deopt_blob()->unpack()", void.class); /** * Descriptor for {@code SharedRuntime::deopt_blob()->unpack_with_exception_in_tls()}. */ - public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, + public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "deopt_blob()->unpack_with_exception_in_tls()", void.class); /** * Descriptor for {@code SharedRuntime::deopt_blob()->uncommon_trap()}. */ - public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNCOMMON_TRAP = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "deopt_blob()->uncommon_trap()", + public static final HotSpotForeignCallDescriptor DEOPT_BLOB_UNCOMMON_TRAP = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "deopt_blob()->uncommon_trap()", void.class); - public static final HotSpotForeignCallDescriptor ENABLE_STACK_RESERVED_ZONE = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "enableStackReservedZoneEntry", + public static final HotSpotForeignCallDescriptor ENABLE_STACK_RESERVED_ZONE = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "enableStackReservedZoneEntry", void.class, Word.class); - public static final HotSpotForeignCallDescriptor THROW_DELAYED_STACKOVERFLOW_ERROR = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "throwDelayedStackoverflowError", + public static final HotSpotForeignCallDescriptor THROW_DELAYED_STACKOVERFLOW_ERROR = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "throwDelayedStackoverflowError", void.class); /** * Descriptor for {@code SharedRuntime::polling_page_return_handler_blob()->entry_point()}. */ - public static final HotSpotForeignCallDescriptor POLLING_PAGE_RETURN_HANDLER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, + public static final HotSpotForeignCallDescriptor POLLING_PAGE_RETURN_HANDLER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallsProviderImpl.NO_LOCATIONS, "polling_page_return_handler_blob()", void.class); protected final GraalHotSpotVMConfig config; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java index 3cbc88304d74..cfe81b02b5ca 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerationResult.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java index 43e2fa8ca624..55d72dc7095c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java index 4b8a8e98b9e8..f0e2fb4edd82 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotLockStack.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; import java.util.Arrays; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java index 44d294bef513..7efccb2dbf85 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotMarkId.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java @@ -23,10 +23,10 @@ * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.code.CompilationResult; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.common.NativeImageReinitialize; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java index 88a24aae83b5..957e0ef2c5ea 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotNodeLIRBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.match.MatchableNode; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; /** * This interface defines the contract a HotSpot backend LIR generator needs to fulfill in addition diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java index 8bbc86bf4f9d..0ab96e14ed8b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotReferenceMapBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; import java.util.ArrayList; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder; +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.vm.ci.code.Location; import jdk.vm.ci.code.ReferenceMap; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java index 92993b53e979..2247eabaf848 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotReplacementsImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java @@ -22,48 +22,47 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotWordOperationPlugin; -import org.graalvm.compiler.hotspot.word.HotSpotOperation; -import org.graalvm.compiler.java.GraphBuilderPhase.Instance; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; -import org.graalvm.compiler.replacements.IntrinsicGraphBuilder; -import org.graalvm.compiler.replacements.ReplacementsImpl; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.meta.MetaAccessProvider; -import jdk.vm.ci.meta.MetaUtil; import jdk.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotSnippetMetaAccessProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotSnippetMetaAccessProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java index e8ec6cb01830..c1c8d24716b7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotSnippetMetaAccessProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java index a1a5f2a9cdb1..4f8933d34ed5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotTTYStreamProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; -import static org.graalvm.compiler.hotspot.HotSpotGraalOptionValues.defaultOptions; +import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.GRAAL_OPTION_PROPERTY_PREFIX; +import static jdk.compiler.graal.hotspot.HotSpotGraalOptionValues.defaultOptions; import java.io.File; import java.io.FileOutputStream; @@ -34,16 +34,16 @@ import java.io.PrintStream; import java.util.List; -import org.graalvm.compiler.core.common.SuppressFBWarnings; -import org.graalvm.compiler.debug.TTYStreamProvider; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.serviceprovider.GlobalAtomicLong; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.IsolateUtil; -import org.graalvm.compiler.serviceprovider.ServiceProvider; -import org.graalvm.compiler.word.Word; +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.vm.ci.common.NativeImageReinitialize; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotZBarrierSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotZBarrierSet.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java index 9d5ff098a383..77b73756bde1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/HotSpotZBarrierSet.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.type.AbstractObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.gc.ZBarrierSet; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java index 64d4f63d25aa..3b3999eda336 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/IsGraalPredicate.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import static jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory.CompilationLevelAdjustment.None; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/IsGraalPredicateBase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/IsGraalPredicateBase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java index 9821fe11b564..bac8352866c9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/IsGraalPredicateBase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import jdk.vm.ci.hotspot.HotSpotJVMCICompilerFactory; import jdk.vm.ci.hotspot.HotSpotJVMCIRuntime; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JFRCompilerProfiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JFRCompilerProfiler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java index 148a0c3949fc..4701b8215250 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JFRCompilerProfiler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import org.graalvm.compiler.core.common.CompilerProfiler; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +import jdk.compiler.graal.core.common.CompilerProfiler; +import jdk.compiler.graal.serviceprovider.ServiceProvider; import jdk.vm.ci.hotspot.JFR; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCICompilerShadow.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCICompilerShadow.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java index 9c9bab911718..f0dca2e89a59 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCICompilerShadow.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import jdk.vm.ci.runtime.JVMCICompiler; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java index 19d306092367..bdd3c8e29202 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCIVersionCheck.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.util.Formatter; import java.util.HashMap; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCIVersionCompare.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCIVersionCompare.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java index 35803f542d92..caf3a1e19001 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/JVMCIVersionCompare.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; public final class JVMCIVersionCompare { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/ProfileReplaySupport.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/ProfileReplaySupport.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java index 3bfcda74a198..5a0e49dfe655 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/ProfileReplaySupport.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import static org.graalvm.compiler.hotspot.ProfileReplaySupport.Options.LoadProfiles; -import static org.graalvm.compiler.hotspot.ProfileReplaySupport.Options.ProfileMethodFilter; -import static org.graalvm.compiler.hotspot.ProfileReplaySupport.Options.SaveProfiles; -import static org.graalvm.compiler.hotspot.ProfileReplaySupport.Options.StrictProfiles; +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 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 org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.MethodFilter; -import org.graalvm.compiler.debug.PathUtilities; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.hotspot.CompilationTask.HotSpotCompilationWrapper; -import org.graalvm.compiler.java.LambdaUtils; -import org.graalvm.compiler.java.StableMethodNameFormatter; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.AccessFieldNode; -import org.graalvm.compiler.nodes.spi.StableProfileProvider; -import org.graalvm.compiler.nodes.spi.StableProfileProvider.LambdaNameFormatter; -import org.graalvm.compiler.nodes.spi.StableProfileProvider.TypeFilter; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.util.json.JSONParser; +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.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -199,7 +199,8 @@ public String formatLamdaName(ResolvedJavaMethod m) { return null; } - public void profileReplayEpilogue(DebugContext debug, HotSpotCompilationWrapper compilation, StableProfileProvider profileProvider, CompilationIdentifier compilationId, int entryBCI, + public void profileReplayEpilogue(DebugContext debug, CompilationTask.HotSpotCompilationWrapper compilation, StableProfileProvider profileProvider, CompilationIdentifier compilationId, + int entryBCI, HotSpotResolvedJavaMethod method) { if ((SaveProfiles.getValue(debug.getOptions()) || LoadProfiles.getValue(debug.getOptions()) != null) && profileFilter.matches(method)) { String codeSignature = null; @@ -242,7 +243,7 @@ public void profileReplayEpilogue(DebugContext debug, HotSpotCompilationWrapper path = debug.getDumpPath(".glog", false, false); } try (PrintStream out = new PrintStream(new BufferedOutputStream(PathUtilities.openOutputStream(path)))) { - out.println(org.graalvm.util.json.JSONFormatter.formatJSON(map, true)); + out.println(JSONFormatter.formatJSON(map, true)); } } catch (Throwable t) { throw debug.handle(t); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetObjectConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetObjectConstant.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java index b2435c26aad1..48b4e84d104c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetObjectConstant.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.util.Objects; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetResolvedJavaMethod.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetResolvedJavaMethod.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java index b5f6c7ad22c1..9a94ad7fe23b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetResolvedJavaMethod.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.lang.annotation.Annotation; import java.lang.reflect.Type; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetResolvedJavaType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetResolvedJavaType.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java index e6b62827715f..4b55058f898e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetResolvedJavaType.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.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 org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.debug.GraalError; import jdk.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetSignature.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetSignature.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetSignature.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetSignature.java index 1a8a27f617b9..0a531cfac460 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SnippetSignature.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetSignature.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; import java.util.ArrayList; import java.util.EnumMap; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java index 7fe25270845f..2542caa31998 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/SymbolicSnippetEncoder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java @@ -22,11 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; -import static org.graalvm.compiler.hotspot.EncodedSnippets.methodKey; -import static org.graalvm.compiler.hotspot.HotSpotReplacementsImpl.isGraalClass; -import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo; +import static jdk.compiler.graal.hotspot.HotSpotReplacementsImpl.isGraalClass; +import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo; import java.lang.reflect.Executable; import java.lang.reflect.Field; @@ -42,78 +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 org.graalvm.collections.EconomicMap; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.MapCursor; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.common.type.AbstractObjectStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.core.common.type.SymbolicJVMCIReference; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeMap; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.hotspot.EncodedSnippets.GraalCapability; -import org.graalvm.compiler.hotspot.EncodedSnippets.GraphData; -import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicEncodedGraph; -import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaField; -import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaFieldLocationIdentity; -import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaMethod; -import org.graalvm.compiler.hotspot.EncodedSnippets.SymbolicResolvedJavaMethodBytecode; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.ForeignCallStub; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.java.BytecodeParser; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.EncodedGraph; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.GraphEncoder; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ProxyNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin; -import org.graalvm.compiler.nodes.java.AccessFieldNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; -import org.graalvm.compiler.nodes.type.NarrowOopStamp; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.schedule.SchedulePhase; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.PartialIntrinsicCallTargetNode; -import org.graalvm.compiler.replacements.ReplacementsImpl; -import org.graalvm.compiler.replacements.SnippetCounter; -import org.graalvm.compiler.replacements.SnippetIntegerHistogram; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.classfile.ClassfileBytecode; +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.vm.ci.code.Architecture; import jdk.vm.ci.code.TargetDescription; @@ -189,7 +181,7 @@ public int hashCode() { } public String keyString() { - return methodKey(method); + return EncodedSnippets.methodKey(method); } public Class receiverClass() { @@ -389,7 +381,7 @@ private boolean verifySnippetEncodeDecode(DebugContext debug, ResolvedJavaMethod } StructuredGraph snippet = filteringReplacements.makeGraph(debug, filteringReplacements.getDefaultReplacementBytecodeProvider(), method, args, null, original, trackNodeSourcePosition, null); - SymbolicEncodedGraph symbolicGraph = new SymbolicEncodedGraph(encodedGraph, method.getDeclaringClass(), null); + EncodedSnippets.SymbolicEncodedGraph symbolicGraph = new EncodedSnippets.SymbolicEncodedGraph(encodedGraph, method.getDeclaringClass(), null); StructuredGraph decodedSnippet = EncodedSnippets.decodeSnippetGraph(symbolicGraph, original != null ? original : method, original, originalReplacements, null, StructuredGraph.AllowAssumptions.ifNonNull(graph.getAssumptions()), graph.getOptions(), false); String snippetString = getCanonicalGraphString(snippet, true, false); @@ -455,7 +447,7 @@ synchronized void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod if (!pendingSnippetGraphs.containsKey(key)) { if (original != null) { - originalMethods.put(key.keyString(), methodKey(original)); + originalMethods.put(key.keyString(), EncodedSnippets.methodKey(original)); } SnippetParameterInfo info = new SnippetParameterInfo(method); snippetParameterInfos.put(key.keyString(), info); @@ -476,7 +468,8 @@ synchronized void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod if (info.isVarargsParameter(i)) { resolvedJavaType = resolvedJavaType.getElementalType(); } - assert resolvedJavaType.isPrimitive() || isGraalClass(resolvedJavaType) : method + ": only Graal classes can be @ConstantParameter or @VarargsParameter: " + type; + assert resolvedJavaType.isPrimitive() || HotSpotReplacementsImpl.isGraalClass(resolvedJavaType) : method + + ": only Graal classes can be @ConstantParameter or @VarargsParameter: " + type; ensureSnippetTypeAvailable(resolvedJavaType); } else { throw new InternalError(type.toString()); @@ -542,13 +535,14 @@ private synchronized EncodedSnippets encodeSnippets(DebugContext debug, Economic } encoder.finishPrepare(); - EconomicMap graphDatas = EconomicMap.create(); + EconomicMap graphDatas = EconomicMap.create(); MapCursor cursor = preparedSnippetGraphs.getEntries(); while (cursor.advance()) { SnippetKey key = cursor.getKey(); String keyString = key.keyString(); - GraphData previous = graphDatas.get(keyString); - GraphData data = GraphData.create(encoder.encode(cursor.getValue()), originalMethods.get(keyString), snippetParameterInfos.get(keyString), key.receiverClass(), previous); + EncodedSnippets.GraphData previous = graphDatas.get(keyString); + EncodedSnippets.GraphData data = EncodedSnippets.GraphData.create(encoder.encode(cursor.getValue()), originalMethods.get(keyString), snippetParameterInfos.get(keyString), + key.receiverClass(), previous); graphDatas.put(keyString, data); } @@ -702,7 +696,7 @@ private Object filterSnippetObject(DebugContext debug, Object o) { } if (o instanceof HotSpotResolvedJavaMethod) { HotSpotResolvedJavaMethod method = (HotSpotResolvedJavaMethod) o; - if (isGraalClass(method.getDeclaringClass())) { + if (HotSpotReplacementsImpl.isGraalClass(method.getDeclaringClass())) { ResolvedJavaMethod snippetMethod = findSnippetMethod(method); cachedFilteredObjects.put(method, snippetMethod); return snippetMethod; @@ -727,7 +721,7 @@ private Object filterSnippetObject(DebugContext debug, Object o) { return null; } else if (o instanceof HotSpotForeignCallsProvider || o instanceof GraalHotSpotVMConfig || o instanceof HotSpotWordTypes || o instanceof TargetDescription || o instanceof SnippetReflectionProvider) { - return new GraalCapability(o.getClass()); + return new EncodedSnippets.GraalCapability(o.getClass()); } else if (o instanceof Stamp) { return filterStamp(debug, (Stamp) o); } else if (o instanceof StampPair) { @@ -738,25 +732,25 @@ private Object filterSnippetObject(DebugContext debug, Object o) { return o; } - private SymbolicResolvedJavaMethod filterMethod(DebugContext debug, ResolvedJavaMethod method) { - SymbolicResolvedJavaMethod symbolic = (SymbolicResolvedJavaMethod) cachedFilteredObjects.get(method); + private EncodedSnippets.SymbolicResolvedJavaMethod filterMethod(DebugContext debug, ResolvedJavaMethod method) { + EncodedSnippets.SymbolicResolvedJavaMethod symbolic = (EncodedSnippets.SymbolicResolvedJavaMethod) cachedFilteredObjects.get(method); if (symbolic != null) { return symbolic; } - if (isGraalClass(method.getDeclaringClass())) { + if (HotSpotReplacementsImpl.isGraalClass(method.getDeclaringClass())) { throw new GraalError("Graal methods shouldn't leak into image: " + method); } UnresolvedJavaType type = (UnresolvedJavaType) filterType(debug, method.getDeclaringClass()); String methodName = method.getName(); String signature = method.getSignature().toMethodDescriptor(); - symbolic = new SymbolicResolvedJavaMethod(type, methodName, signature); + symbolic = new EncodedSnippets.SymbolicResolvedJavaMethod(type, methodName, signature); debug.log(DebugContext.VERBOSE_LEVEL, "filtered %s -> %s", method, symbolic); cachedFilteredObjects.put(method, symbolic); return symbolic; } - private SymbolicResolvedJavaMethodBytecode filterBytecode(DebugContext debug, ResolvedJavaMethodBytecode bytecode) { - SymbolicResolvedJavaMethodBytecode symbolic = (SymbolicResolvedJavaMethodBytecode) cachedFilteredObjects.get(bytecode); + private EncodedSnippets.SymbolicResolvedJavaMethodBytecode filterBytecode(DebugContext debug, ResolvedJavaMethodBytecode bytecode) { + EncodedSnippets.SymbolicResolvedJavaMethodBytecode symbolic = (EncodedSnippets.SymbolicResolvedJavaMethodBytecode) cachedFilteredObjects.get(bytecode); if (symbolic != null) { return symbolic; } @@ -771,7 +765,7 @@ private JavaType filterType(DebugContext debug, ResolvedJavaType type) { if (unresolvedJavaType != null) { return unresolvedJavaType; } - if (isGraalClass(type)) { + if (HotSpotReplacementsImpl.isGraalClass(type)) { throw new GraalError("Graal types shouldn't leak into image: " + type); } unresolvedJavaType = UnresolvedJavaType.create(type.getName()); @@ -781,7 +775,7 @@ private JavaType filterType(DebugContext debug, ResolvedJavaType type) { } private Object filterFieldLocationIdentity(DebugContext debug, HotSpotResolvedJavaField field) { - return new SymbolicResolvedJavaFieldLocationIdentity((SymbolicResolvedJavaField) filterField(debug, field)); + return new EncodedSnippets.SymbolicResolvedJavaFieldLocationIdentity((EncodedSnippets.SymbolicResolvedJavaField) filterField(debug, field)); } private Object filterField(DebugContext debug, HotSpotResolvedJavaField field) { @@ -793,7 +787,7 @@ private Object filterField(DebugContext debug, HotSpotResolvedJavaField field) { String name = field.getName(); UnresolvedJavaType signature = (UnresolvedJavaType) filterType(debug, (ResolvedJavaType) field.getType()); boolean isStatic = field.isStatic(); - return new SymbolicResolvedJavaField(declaringType, name, signature, isStatic); + return new EncodedSnippets.SymbolicResolvedJavaField(declaringType, name, signature, isStatic); } private Object filterStampPair(DebugContext debug, StampPair stampPair) { @@ -1075,7 +1069,7 @@ protected boolean tryInvocationPlugin(CallTargetNode.InvokeKind invokeKind, Valu private static synchronized SnippetResolvedJavaType lookupSnippetType(Class clazz) { SnippetResolvedJavaType type = null; - if (isGraalClass(clazz)) { + if (HotSpotReplacementsImpl.isGraalClass(clazz)) { type = snippetTypes.get(clazz); if (type == null) { type = createType(clazz); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java index 693734d70e74..41704597a042 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackend.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.NMETHOD_ENTRY_BARRIER; - -import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.gen.LIRGenerationProvider; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotDataBuilder; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotHostBackend; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64FrameMap; -import org.graalvm.compiler.lir.aarch64.AArch64FrameMapBuilder; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.asm.DataBuilder; -import org.graalvm.compiler.lir.asm.EntryPointDecorator; -import org.graalvm.compiler.lir.asm.FrameContext; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CallingConvention; @@ -267,7 +267,7 @@ private void emitNmethodEntryBarrier(CompilationResultBuilder crb, AArch64MacroA Register scratch2 = sc2.getRegister(); GraalError.guarantee(HotSpotMarkId.ENTRY_BARRIER_PATCH.isAvailable(), "must be available"); - ForeignCallLinkage callTarget = getForeignCalls().lookupForeignCall(NMETHOD_ENTRY_BARRIER); + ForeignCallLinkage callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.NMETHOD_ENTRY_BARRIER); Register thread = getProviders().getRegisters().getThreadRegister(); // The assembly sequence is from diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java index ce159e0e5030..af4cbdf3e322 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotBackendFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java @@ -23,41 +23,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.core.aarch64.AArch64AddressLoweringByUse; -import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool; -import org.graalvm.compiler.core.aarch64.AArch64SuitesCreator; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackendFactory; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; -import org.graalvm.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegisters; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.AddressLoweringByUsePhase; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.replacements.aarch64.AArch64GraphBuilderPlugins; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java index 8c06c8b88fe2..fdfa182deaa0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java index 55332b695154..7f45888a69b5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java @@ -23,18 +23,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCounterOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCounterOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java index 398d9496fcc0..a819c99f5e0d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotCounterOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotCounterOp; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java index 7f2874ebe680..b5a5de806262 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java @@ -22,16 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; - -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Removes the current frame and tail calls the uncommon trap routine. @@ -47,6 +46,6 @@ public AArch64HotSpotDeoptimizeCallerOp(GraalHotSpotVMConfig config) { @Override public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { leaveFrame(crb, masm, /* emitSafepoint */false, false); - AArch64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(DEOPT_BLOB_UNCOMMON_TRAP)); + AArch64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP)); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java index a0a2cc9fd707..47945c9c97a3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java @@ -22,18 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; - -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp.BlockEndOp; -import org.graalvm.compiler.lir.aarch64.AArch64BlockEndOp; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; @Opcode("DEOPT") public class AArch64HotSpotDeoptimizeOp extends AArch64BlockEndOp implements BlockEndOp { @@ -49,7 +48,7 @@ public AArch64HotSpotDeoptimizeOp(LIRFrameState info) { @Override public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { try (AArch64MacroAssembler.ScratchRegister scratch = masm.getScratchRegister()) { - AArch64Call.directCall(crb, masm, crb.foreignCalls.lookupForeignCall(DEOPT_BLOB_UNCOMMON_TRAP), scratch.getRegister(), info, null); + AArch64Call.directCall(crb, masm, crb.foreignCalls.lookupForeignCall(HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP), scratch.getRegister(), info, null); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java index 351397b6d79b..dbd8025150fe 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; @@ -63,6 +63,6 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { // Store original return address in TLS masm.str(64, lr, masm.makeAddress(64, thread, config.threadExceptionPcOffset)); - AArch64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS)); + AArch64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS)); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java index 7ba198563c6c..a3f7604fb8fa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCacheRegister; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64Call.DirectCallOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; +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.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java index fa51bf3c0868..5ada65d3127d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.hotspot.aarch64.AArch64HotSpotRegisterConfig.inlineCacheRegister; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64Call.DirectCallOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; +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.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java index 40cfb50e5174..1b01f71973e7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotEpilogueOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java @@ -22,27 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 static org.graalvm.compiler.hotspot.HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.aarch64.AArch64BlockEndOp; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; @@ -80,7 +79,7 @@ protected void leaveFrame(CompilationResultBuilder crb, AArch64MacroAssembler ma masm.subs(64, zr, sp, scratch); } masm.branchConditionally(AArch64Assembler.ConditionFlag.LO, noReserved); - ForeignCallLinkage enableStackReservedZone = foreignCalls.lookupForeignCall(ENABLE_STACK_RESERVED_ZONE); + ForeignCallLinkage enableStackReservedZone = foreignCalls.lookupForeignCall(HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE); CallingConvention cc = enableStackReservedZone.getOutgoingCallingConvention(); assert cc.getArgumentCount() == 1; Register arg0 = ((RegisterValue) cc.getArgument(0)).getRegister(); @@ -90,7 +89,7 @@ protected void leaveFrame(CompilationResultBuilder crb, AArch64MacroAssembler ma AArch64Call.directCall(crb, masm, enableStackReservedZone, sc.getRegister(), null); masm.ldp(64, fp, lr, AArch64Address.createImmediateAddress(64, AArch64Address.AddressingMode.IMMEDIATE_PAIR_POST_INDEXED, sp, 2 * 8)); } - AArch64Call.directJmp(crb, masm, foreignCalls.lookupForeignCall(THROW_DELAYED_STACKOVERFLOW_ERROR)); + AArch64Call.directJmp(crb, masm, foreignCalls.lookupForeignCall(HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR)); masm.bind(noReserved); } if (emitSafepoint) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java similarity index 73% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java index 5b0308bb41b1..7f6cc9e3511a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java @@ -22,23 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CodeCacheProvider; @@ -69,8 +67,9 @@ public void initialize(HotSpotProviders providers, OptionValues options) { RegisterValue exception = r0.asValue(LIRKind.reference(word)); RegisterValue exceptionPc = r3.asValue(LIRKind.value(word)); CallingConvention exceptionCc = new CallingConvention(0, ILLEGAL, exception, exceptionPc); - register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); - register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); + register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER, 0L, HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); + register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER, HotSpotForeignCallLinkage.JUMP_ADDRESS, + HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); super.initialize(providers, options); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java index 90c27853077c..646399802d98 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java index 337397cbd984..159f3149e149 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java @@ -24,67 +24,67 @@ * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRValueUtil.asConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +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 java.util.Arrays; import java.util.EnumSet; import java.util.function.Consumer; import java.util.function.Function; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.PrefetchMode; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.aarch64.AArch64ArithmeticLIRGenerator; -import org.graalvm.compiler.core.aarch64.AArch64LIRGenerator; -import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotDebugInfoBuilder; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.hotspot.HotSpotLockStack; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow.StrategySwitchOp; -import org.graalvm.compiler.lir.aarch64.AArch64FrameMapBuilder; -import org.graalvm.compiler.lir.aarch64.AArch64Move; -import org.graalvm.compiler.lir.aarch64.AArch64Move.StoreOp; -import org.graalvm.compiler.lir.aarch64.AArch64PrefetchOp; -import org.graalvm.compiler.lir.aarch64.AArch64RestoreRegistersOp; -import org.graalvm.compiler.lir.aarch64.AArch64SaveRegistersOp; -import org.graalvm.compiler.lir.aarch64.AArch64SpinWaitOp; -import org.graalvm.compiler.lir.gen.BarrierSetLIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.MoveFactory; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java similarity index 73% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java index 07c6d5de4a04..74d64c956768 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotLoweringProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java @@ -23,26 +23,26 @@ * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import org.graalvm.compiler.core.aarch64.AArch64LoweringProviderMixin; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets; -import org.graalvm.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.aarch64.AArch64IntegerArithmeticSnippets; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java index 86842a6e534b..cdf3117a3831 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMacroAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java index 38afd6264855..736eabe64b1c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMove.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.code.Register; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java index ab7a06eb1b57..a278cc0243af 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotMoveFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.meta.JavaConstant.INT_0; import static jdk.vm.ci.meta.JavaConstant.LONG_0; -import org.graalvm.compiler.core.aarch64.AArch64MoveFactory; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; +import jdk.compiler.graal.core.aarch64.AArch64MoveFactory; +import jdk.compiler.graal.lir.aarch64.AArch64LIRInstruction; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java index 0771e01b3b07..71d73762aa43 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; - -import org.graalvm.compiler.core.aarch64.AArch64NodeLIRBuilder; -import org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.gen.DebugInfoBuilder; -import org.graalvm.compiler.hotspot.HotSpotDebugInfoBuilder; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.hotspot.HotSpotLockStack; -import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder; -import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64BreakpointOp; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.BreakpointNode; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.DirectCallTargetNode; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.IndirectCallTargetNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.SafepointNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.NodeValueMap; + +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.BytecodeFrame; @@ -145,7 +145,7 @@ public void emitPatchReturnAddress(ValueNode address) { @Override public void emitJumpToExceptionHandlerInCaller(ValueNode handlerInCallerPc, ValueNode exception, ValueNode exceptionPc) { AllocatableValue handler = gen.asAllocatable(operand(handlerInCallerPc)); - ForeignCallLinkage linkage = gen.getForeignCalls().lookupForeignCall(EXCEPTION_HANDLER_IN_CALLER); + ForeignCallLinkage linkage = gen.getForeignCalls().lookupForeignCall(HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER); CallingConvention outgoingCc = linkage.getOutgoingCallingConvention(); assert outgoingCc.getArgumentCount() == 2; RegisterValue exceptionFixed = (RegisterValue) outgoingCc.getArgument(0); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java index 4e3a013811de..8aae784cbf08 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java index f25223089c68..ebbe11416dad 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java index a39fa888a20b..547a4eb550a0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotReturnOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java index eae9a18d9bca..de3574a9c3e0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSafepointOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; @@ -89,7 +89,7 @@ public static void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler // store mark pc in scratch masm.adr(scratch, poll); masm.str(64, scratch, masm.makeAddress(64, thread, config.savedExceptionPCOffset)); - AArch64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(POLLING_PAGE_RETURN_HANDLER)); + AArch64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER)); }); } else { masm.ldr(64, scratch, masm.makeAddress(64, thread, config.threadPollingPageOffset, scratch)); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java index d391858405c1..e12e4b952d96 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import java.util.function.Function; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesCreator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java index 3b088405b2bc..b4f6270a63a8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotSuitesCreator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; -import org.graalvm.compiler.core.aarch64.AArch64SuitesCreator; -import org.graalvm.compiler.hotspot.HotSpotGraphBuilderPhase; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; +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; public class AArch64HotSpotSuitesCreator extends AArch64SuitesCreator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java index 0fb0f7df71b4..099f4f9d43d0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotUnwindOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; @@ -59,7 +59,7 @@ public AArch64HotSpotUnwindOp(GraalHotSpotVMConfig config, RegisterValue excepti public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { leaveFrame(crb, masm, /* emitSafepoint */false, false); - ForeignCallLinkage linkage = crb.foreignCalls.lookupForeignCall(UNWIND_EXCEPTION_TO_CALLER); + ForeignCallLinkage linkage = crb.foreignCalls.lookupForeignCall(HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER); CallingConvention cc = linkage.getOutgoingCallingConvention(); assert cc.getArgumentCount() == 2; assert exception.equals(cc.getArgument(0)); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java index bfd8ebd7e27a..b7aa62259e6f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java index de46f823e582..46be0b649d5c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java @@ -22,34 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; - -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_PHANTOM_REFERS_TO_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_REFERENCE_GET_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_WEAK_REFERS_TO_BARRIER; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.aarch64.AArch64BarrierSetLIRGenerator; -import org.graalvm.compiler.core.aarch64.AArch64LIRGenerator; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64FrameMap; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CallingConvention; @@ -165,16 +161,16 @@ public ForeignCallLinkage getBarrierStub(BarrierType barrierType) { ForeignCallLinkage callTarget; switch (barrierType) { case READ: - callTarget = getForeignCalls().lookupForeignCall(Z_FIELD_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER); break; case REFERENCE_GET: - callTarget = getForeignCalls().lookupForeignCall(Z_REFERENCE_GET_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_REFERENCE_GET_BARRIER); break; case WEAK_REFERS_TO: - callTarget = getForeignCalls().lookupForeignCall(Z_WEAK_REFERS_TO_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_WEAK_REFERS_TO_BARRIER); break; case PHANTOM_REFERS_TO: - callTarget = getForeignCalls().lookupForeignCall(Z_PHANTOM_REFERS_TO_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_PHANTOM_REFERS_TO_BARRIER); break; default: throw GraalError.shouldNotReachHere("Unexpected barrier type: " + barrierType); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java index af06a3595021..3ac4d3f356ab 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java index 08ce8cb18a14..9977e33afdb4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64AtomicMove; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java index 2de3f3900358..cdaabdfa421b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.aarch64.AArch64AddressValue; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java index d6a5c3c41f84..0515d4065fb4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/aarch64/AArch64IndirectCallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.aarch64; +package jdk.compiler.graal.hotspot.aarch64; import static jdk.vm.ci.aarch64.AArch64.r12; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.aarch64.AArch64Call; -import org.graalvm.compiler.lir.aarch64.AArch64Call.IndirectCallOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java index c1a1a9d5d5c3..558f3c212995 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64DeoptimizeOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; +import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp.BlockEndOp; -import org.graalvm.compiler.lir.amd64.AMD64BlockEndOp; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; @Opcode("DEOPT") final class AMD64DeoptimizeOp extends AMD64BlockEndOp implements BlockEndOp { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java index 7b958f650493..b63e2a74068f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotAddressLowering.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java @@ -23,35 +23,35 @@ * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; import org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.amd64.AMD64AddressNode; -import org.graalvm.compiler.core.amd64.AMD64CompressAddressLowering; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.loop.BasicInductionVariable; -import org.graalvm.compiler.nodes.loop.CountedLoopInfo; -import org.graalvm.compiler.nodes.loop.DerivedInductionVariable; -import org.graalvm.compiler.nodes.loop.InductionVariable; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.LoopsDataProvider; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java index 1ca870febe2d..3808534bd9fd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackend.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java @@ -22,54 +22,54 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.NMETHOD_ENTRY_BARRIER; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.gen.LIRGenerationProvider; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotDataBuilder; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotHostBackend; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64FrameMap; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.asm.DataBuilder; -import org.graalvm.compiler.lir.asm.EntryPointDecorator; -import org.graalvm.compiler.lir.asm.FrameContext; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.options.OptionValues; +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 jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.code.CallingConvention; @@ -177,7 +177,7 @@ public void enter(CompilationResultBuilder crb) { private void emitNmethodEntryBarrier(CompilationResultBuilder crb, AMD64HotSpotMacroAssembler asm) { GraalError.guarantee(HotSpotMarkId.ENTRY_BARRIER_PATCH.isAvailable(), "must be available"); - ForeignCallLinkage callTarget = getForeignCalls().lookupForeignCall(NMETHOD_ENTRY_BARRIER); + ForeignCallLinkage callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.NMETHOD_ENTRY_BARRIER); // The assembly sequence is from // src/hotspot/cpu/x86/gc/shared/barrierSetAssembler_x86.cpp. It was improved in diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java index 155573edae3a..98103ca7d8e6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotBackendFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackendFactory; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; -import org.graalvm.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegisters; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.AddressLoweringByNodePhase; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.replacements.amd64.AMD64GraphBuilderPlugins; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java index 34227fdb06fd..c1ab7ceae1b6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java index e9a46d3ad1a9..bbbecedba1c5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rsp; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java index 851ad21fc0a6..e88330a3803f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotCounterOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.asJavaConstant; +import static jdk.compiler.graal.lir.LIRValueUtil.isJavaConstant; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotCounterOp; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java index aed73ea814f7..006a94c0c745 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; - -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Removes the current frame and tail calls the uncommon trap routine. @@ -47,6 +46,6 @@ protected AMD64HotSpotDeoptimizeCallerOp() { @Override public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { leaveFrameAndRestoreRbp(crb, masm); - AMD64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(DEOPT_BLOB_UNCOMMON_TRAP), null); + AMD64Call.directJmp(crb, masm, crb.foreignCalls.lookupForeignCall(HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP), null); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java index ea5c0ad00861..914847fb0aaa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; +import static jdk.compiler.graal.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java index 56df4fd049a8..089971799c78 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64Call.DirectCallOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; +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.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java index 8ad72dcd104a..10fee44a61c3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +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 org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.amd64.AMD64BlockEndOp; -import org.graalvm.compiler.lir.amd64.AMD64FrameMap; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java similarity index 50% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java index c4a85f2de781..3a6cfb4693c2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java @@ -22,38 +22,33 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; -import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; +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 org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.IntrinsicStubsGen; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsForeignCalls; -import org.graalvm.compiler.replacements.nodes.VectorizedHashCodeNode; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.CodeCacheProvider; @@ -85,8 +80,9 @@ public void initialize(HotSpotProviders providers, OptionValues options) { RegisterValue exception = rax.asValue(LIRKind.reference(word)); RegisterValue exceptionPc = rdx.asValue(LIRKind.value(word)); CallingConvention exceptionCc = new CallingConvention(0, ILLEGAL, exception, exceptionPc); - register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER, 0L, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); - register(new HotSpotForeignCallLinkageImpl(EXCEPTION_HANDLER_IN_CALLER, JUMP_ADDRESS, DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); + register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER, 0L, HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); + register(new HotSpotForeignCallLinkageImpl(HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER, HotSpotForeignCallLinkage.JUMP_ADDRESS, + HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS, exceptionCc, null)); linkSnippetStubs(providers, options, IntrinsicStubsGen::new, ArrayEqualsForeignCalls.STUBS_AMD64); linkSnippetStubs(providers, options, IntrinsicStubsGen::new, VectorizedHashCodeNode.STUBS); @@ -101,14 +97,21 @@ public Value[] getNativeABICallerSaveRegisters() { @Override protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotProviders providers, OptionValues options) { - if (GraalArithmeticStubs.getValue(options)) { - link(new AMD64MathStub(SIN, options, providers, registerStubCall(SIN.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(COS, options, providers, registerStubCall(COS.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(TAN, options, providers, registerStubCall(TAN.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(EXP, options, providers, registerStubCall(EXP.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(LOG, options, providers, registerStubCall(LOG.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(LOG10, options, providers, registerStubCall(LOG10.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); - link(new AMD64MathStub(POW, options, providers, registerStubCall(POW.foreignCallSignature, LEAF, REEXECUTABLE, COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + if (HotSpotBackend.Options.GraalArithmeticStubs.getValue(options)) { + link(new AMD64MathStub(SIN, options, providers, registerStubCall(SIN.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(COS, options, providers, registerStubCall(COS.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(TAN, options, providers, registerStubCall(TAN.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(EXP, options, providers, registerStubCall(EXP.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(LOG, options, providers, registerStubCall(LOG.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(LOG10, options, providers, registerStubCall(LOG10.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); + link(new AMD64MathStub(POW, options, providers, registerStubCall(POW.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED, NO_LOCATIONS))); } else { super.registerMathStubs(hotSpotVMConfig, providers, options); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotFrameMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotFrameMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java index 29ede7396891..d9f31cb054bb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotFrameMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.MASK; import static jdk.vm.ci.code.ValueUtil.asStackSlot; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.amd64.AMD64FrameMap; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.compiler.graal.lir.amd64.AMD64FrameMap; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java index 7e5d890b20cd..bd325eadb269 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.lir.amd64.AMD64FrameMapBuilder; -import org.graalvm.compiler.lir.framemap.FrameMap; +import jdk.compiler.graal.lir.amd64.AMD64FrameMapBuilder; +import jdk.compiler.graal.lir.framemap.FrameMap; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotIndirectCallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotIndirectCallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java index 59dd955b1838..50673bb2b6f1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotIndirectCallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64Call.IndirectCallOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java index 86987707e322..9ea4143835f8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java index 31350cbc02e3..f1f251858f2d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.amd64.AMD64ArithmeticLIRGenerator; -import org.graalvm.compiler.core.amd64.AMD64LIRGenerator; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotDebugInfoBuilder; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.hotspot.HotSpotLockStack; -import org.graalvm.compiler.hotspot.debug.BenchmarkCounters; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.StandardOp.NoOp; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.StrategySwitchOp; -import org.graalvm.compiler.lir.amd64.AMD64Move; -import org.graalvm.compiler.lir.amd64.AMD64Move.MoveFromRegOp; -import org.graalvm.compiler.lir.amd64.AMD64PrefetchOp; -import org.graalvm.compiler.lir.amd64.AMD64ReadTimestampCounterWithProcid; -import org.graalvm.compiler.lir.amd64.AMD64RestoreRegistersOp; -import org.graalvm.compiler.lir.amd64.AMD64SaveRegistersOp; -import org.graalvm.compiler.lir.amd64.AMD64VZeroUpper; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.BarrierSetLIRGenerator; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.MoveFactory; -import org.graalvm.compiler.lir.gen.MoveFactory.BackupSlotProvider; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java index 2a5c5cd7759c..68ba0fd070a9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRKindTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.core.amd64.AMD64LIRKindTool; -import org.graalvm.compiler.core.common.LIRKind; +import jdk.compiler.graal.core.amd64.AMD64LIRKindTool; +import jdk.compiler.graal.core.common.LIRKind; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java index 466693b420d6..9ede4ac681e9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotLoweringProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java @@ -22,31 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.hotspot.HotSpotBackend.Options.GraalArithmeticStubs; - -import org.graalvm.compiler.core.amd64.AMD64LoweringProviderMixin; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets; -import org.graalvm.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.amd64.AMD64ConvertSnippets; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.code.TargetDescription; @@ -99,7 +98,7 @@ private void lowerUnaryMath(UnaryMathIntrinsicNode math, LoweringTool tool) { // lowering to emit the stub assembly code instead of the Node lowering. return; } - if (!GraalArithmeticStubs.getValue(graph.getOptions())) { + if (!HotSpotBackend.Options.GraalArithmeticStubs.getValue(graph.getOptions())) { switch (math.getOperation()) { case SIN: case COS: diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMacroAssembler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMacroAssembler.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java index 1ecf19ba9f73..f8370702079c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMacroAssembler.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java index 790ce69f5762..843185334991 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java index 3566ec802e1b..30214d28c938 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMove.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; - -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.code.Register; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java index eea241eff41e..7c7d055f0881 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotMoveFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.core.amd64.AMD64MoveFactory; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; +import jdk.compiler.graal.core.amd64.AMD64MoveFactory; +import jdk.compiler.graal.lir.LIRInstruction; +import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction; import jdk.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java index cb75892de35d..960dc3e86bca 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rbp; -import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; - -import org.graalvm.compiler.core.amd64.AMD64NodeLIRBuilder; -import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.gen.DebugInfoBuilder; -import org.graalvm.compiler.hotspot.HotSpotDebugInfoBuilder; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.hotspot.HotSpotLockStack; -import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder; -import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.amd64.AMD64BreakpointOp; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodes.BreakpointNode; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.DirectCallTargetNode; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.IndirectCallTargetNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.SafepointNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.NodeValueMap; -import org.graalvm.compiler.replacements.amd64.AMD64IntrinsicStubs; +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 jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java index 4e612503ff30..d93e036ded5a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java index 6d312f4d771c..b0e6a211cd85 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java index 18deaf3393ab..44cffa5669e3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; +import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java index 4a9ef99d1be0..67e746f3d12a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java index 4fbf8c4bcb59..a3553a4df2ae 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotReturnOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java @@ -22,27 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r15; import static jdk.vm.ci.amd64.AMD64.rsp; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProvider; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.code.CallingConvention; @@ -89,7 +88,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { if (stackAdjust > 0) { masm.subq(rsp, stackAdjust); } - ForeignCallLinkage enableStackReservedZone = foreignCalls.lookupForeignCall(ENABLE_STACK_RESERVED_ZONE); + ForeignCallLinkage enableStackReservedZone = foreignCalls.lookupForeignCall(HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE); CallingConvention cc = enableStackReservedZone.getOutgoingCallingConvention(); assert cc.getArgumentCount() == 1; Register arg0 = ((RegisterValue) cc.getArgument(0)).getRegister(); @@ -98,7 +97,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { if (stackAdjust > 0) { masm.addq(rsp, stackAdjust); } - AMD64Call.directJmp(crb, masm, foreignCalls.lookupForeignCall(THROW_DELAYED_STACKOVERFLOW_ERROR), scratchForSafepointOnReturn); + AMD64Call.directJmp(crb, masm, foreignCalls.lookupForeignCall(HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR), scratchForSafepointOnReturn); masm.bind(noReserved); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java index ddd4e11eb866..eb339b9cdab3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSafepointOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; +import static jdk.compiler.graal.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; import java.util.function.IntConsumer; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java index e96c65aec58b..c3dcf433a4a9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.amd64.AMD64ControlFlow; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.code.ValueUtil; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java index deed425f91f5..880d339aa48e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotSuitesCreator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.core.amd64.AMD64SuitesCreator; -import org.graalvm.compiler.hotspot.HotSpotGraphBuilderPhase; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; +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; public class AMD64HotSpotSuitesCreator extends AMD64SuitesCreator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java index 8de6ef3fec5d..2e7967967e4b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotUnwindOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; import static jdk.vm.ci.amd64.AMD64.rsp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; @@ -60,7 +60,7 @@ final class AMD64HotSpotUnwindOp extends AMD64HotSpotEpilogueBlockEndOp { public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { leaveFrameAndRestoreRbp(crb, masm); - ForeignCallLinkage linkage = crb.foreignCalls.lookupForeignCall(UNWIND_EXCEPTION_TO_CALLER); + ForeignCallLinkage linkage = crb.foreignCalls.lookupForeignCall(HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER); CallingConvention cc = linkage.getOutgoingCallingConvention(); assert cc.getArgumentCount() == 2; assert exception.equals(cc.getArgument(0)); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java index 46162f0da454..2b6ef3c3de4d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64Kind.QWORD; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64Move; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java index 2c8ed39d98e4..746f8948fc56 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java @@ -22,38 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.amd64.AMD64.r15; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_ARRAY_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_PHANTOM_REFERS_TO_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_REFERENCE_GET_BARRIER; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_WEAK_REFERS_TO_BARRIER; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.core.amd64.AMD64BarrierSetLIRGenerator; -import org.graalvm.compiler.core.amd64.AMD64LIRGenerator; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64FrameMap; -import org.graalvm.compiler.lir.amd64.vector.AMD64VectorMove; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.phases.util.Providers; + +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.CallingConvention; @@ -147,7 +143,7 @@ public Variable emitBarrieredLoad(LIRKind kind, Value address, LIRFrameState sta if (kind.getPlatformKind().getVectorLength() > 1) { // Emit a vector barrier assert barrierType == BarrierType.READ; - ForeignCallLinkage callTarget = getForeignCalls().lookupForeignCall(Z_ARRAY_BARRIER); + ForeignCallLinkage callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_ARRAY_BARRIER); AMD64AddressValue loadAddress = getAMD64LIRGen().asAddressValue(address); Variable result = getLIRGen().newVariable(getLIRGen().toRegisterKind(kind)); @@ -164,16 +160,16 @@ public ForeignCallLinkage getBarrierStub(BarrierType barrierType) { ForeignCallLinkage callTarget; switch (barrierType) { case READ: - callTarget = getForeignCalls().lookupForeignCall(Z_FIELD_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER); break; case REFERENCE_GET: - callTarget = getForeignCalls().lookupForeignCall(Z_REFERENCE_GET_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_REFERENCE_GET_BARRIER); break; case WEAK_REFERS_TO: - callTarget = getForeignCalls().lookupForeignCall(Z_WEAK_REFERS_TO_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_WEAK_REFERS_TO_BARRIER); break; case PHANTOM_REFERS_TO: - callTarget = getForeignCalls().lookupForeignCall(Z_PHANTOM_REFERS_TO_BARRIER); + callTarget = getForeignCalls().lookupForeignCall(HotSpotHostForeignCallsProvider.Z_PHANTOM_REFERS_TO_BARRIER); break; default: throw GraalError.shouldNotReachHere("Unexpected barrier type: " + barrierType); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZBarrieredOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZBarrieredOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java index 5c721068fbf6..6cd471cd53ee 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZBarrieredOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java index 8e091c898e45..e5720a0348ca 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java index 40c1a2a766be..d01db99b1829 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; +import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64RMOp.MOV; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java index fb1aa0a65cd5..8a0b71c33317 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.amd64.AMD64AddressValue; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.code.CallingConvention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java index 9325ab4884f8..d3048191f60f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64Call; -import org.graalvm.compiler.lir.amd64.AMD64Call.DirectCallOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; +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.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java index 754a11711436..3914a45896ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64MathStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.SnippetStub; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode; -import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +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; /** * Stub called to support {@link Math}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java index 0589e952420a..72947dca8c60 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64TailcallOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.InstalledCode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java index ddd4d4b1671f..cf34f1ae7dcf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathIntrinsicNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.PrimitiveStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.UnaryNode; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java index 92857549bf3d..faaf08e6ed49 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/amd64/AMD64X87MathSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.amd64; +package jdk.compiler.graal.hotspot.amd64; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode; -import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation; +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; public class AMD64X87MathSnippets implements Snippets { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java index 136c9239ff04..6ac5a4c3c745 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/BenchmarkCounters.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.debug; +package jdk.compiler.graal.hotspot.debug; -import static org.graalvm.compiler.debug.PathUtilities.getAbsolutePath; +import static jdk.compiler.graal.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 org.graalvm.compiler.core.GraalServiceThread; -import org.graalvm.compiler.core.common.SuppressFBWarnings; -import org.graalvm.compiler.debug.CSVUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.PathUtilities; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.nodes.debug.DynamicCounterNode; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.services.Services; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java index 6507fb258b0e..49d61195af72 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/lir/HotSpotZapRegistersPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.lir; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerationResult; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInsertionBuffer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.ValueConsumer; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapStackArgumentSpaceBeforeInstruction; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/lir/VerifyMaxRegisterSizePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/lir/VerifyMaxRegisterSizePhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java index 77afee8d2218..f04da872455d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/lir/VerifyMaxRegisterSizePhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.lir; +package jdk.compiler.graal.hotspot.lir; import static jdk.vm.ci.code.ValueUtil.isRegister; import java.util.EnumSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java index 1211f60be05f..cadd34c9e05f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java @@ -23,16 +23,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.AddressLoweringPhase; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.SuitesCreator; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java index d8f306749bb1..d77e1c2357b5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/DefaultHotSpotLoweringProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java @@ -22,22 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static org.graalvm.compiler.core.common.GraalOptions.AlwaysInlineVTableStubs; -import static org.graalvm.compiler.core.common.GraalOptions.InlineVTableStubs; -import static org.graalvm.compiler.core.common.GraalOptions.OmitHotExceptionStacktrace; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.OSR_MIGRATION_END; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_KLASS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_MIRROR_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.COMPRESSED_HUB_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_LAYOUT_HELPER_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJ_ARRAY_KLASS_ELEMENT_KLASS_LOCATION; +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 org.graalvm.word.LocationIdentity.any; import java.util.Arrays; @@ -46,152 +37,152 @@ import java.util.List; import java.util.Map; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.nodes.BeginLockScopeNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotDirectCallTargetNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotIndirectCallTargetNode; -import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; -import org.graalvm.compiler.hotspot.nodes.VMErrorNode; -import org.graalvm.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode; -import org.graalvm.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.nodes.type.MethodPointerStamp; -import org.graalvm.compiler.hotspot.replacements.AssertionSnippets; -import org.graalvm.compiler.hotspot.replacements.ClassGetHubNode; -import org.graalvm.compiler.hotspot.replacements.DigestBaseSnippets; -import org.graalvm.compiler.hotspot.replacements.FastNotifyNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets; -import org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets; -import org.graalvm.compiler.hotspot.replacements.HotSpotHashCodeSnippets; -import org.graalvm.compiler.hotspot.replacements.HotSpotIsArraySnippets; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.replacements.HotSpotSerialWriteBarrierSnippets; -import org.graalvm.compiler.hotspot.replacements.HubGetClassNode; -import org.graalvm.compiler.hotspot.replacements.InstanceOfSnippets; -import org.graalvm.compiler.hotspot.replacements.KlassLayoutHelperNode; -import org.graalvm.compiler.hotspot.replacements.LoadExceptionObjectSnippets; -import org.graalvm.compiler.hotspot.replacements.LogSnippets; -import org.graalvm.compiler.hotspot.replacements.MonitorSnippets; -import org.graalvm.compiler.hotspot.replacements.ObjectCloneSnippets; -import org.graalvm.compiler.hotspot.replacements.ObjectSnippets; -import org.graalvm.compiler.hotspot.replacements.RegisterFinalizerSnippets; -import org.graalvm.compiler.hotspot.replacements.StringToBytesSnippets; -import org.graalvm.compiler.hotspot.replacements.UnsafeCopyMemoryNode; -import org.graalvm.compiler.hotspot.replacements.UnsafeSnippets; -import org.graalvm.compiler.hotspot.replacements.VirtualThreadUpdateJFRSnippets; -import org.graalvm.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import org.graalvm.compiler.hotspot.stubs.ForeignCallSnippets; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractDeoptimizeNode; -import org.graalvm.compiler.nodes.CompressionNode.CompressionOp; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeadEndNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.GraphState.GuardsStage; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.LogicConstantNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.LoweredCallTargetNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SafepointNode; -import org.graalvm.compiler.nodes.StartNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.UnwindNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.CompareNode; -import org.graalvm.compiler.nodes.calc.FloatingIntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.calc.IntegerDivRemNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.calc.RemNode; -import org.graalvm.compiler.nodes.calc.SignedDivNode; -import org.graalvm.compiler.nodes.calc.SignedFloatingIntegerDivNode; -import org.graalvm.compiler.nodes.calc.SignedFloatingIntegerRemNode; -import org.graalvm.compiler.nodes.calc.SignedRemNode; -import org.graalvm.compiler.nodes.debug.StringToBytesNode; -import org.graalvm.compiler.nodes.debug.VerifyHeapNode; -import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.extended.GetClassNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.extended.LoadMethodNode; -import org.graalvm.compiler.nodes.extended.OSRLocalNode; -import org.graalvm.compiler.nodes.extended.OSRLockNode; -import org.graalvm.compiler.nodes.extended.OSRMonitorEnterNode; -import org.graalvm.compiler.nodes.extended.OSRStartNode; -import org.graalvm.compiler.nodes.extended.StoreHubNode; -import org.graalvm.compiler.nodes.gc.G1ArrayRangePostWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1ArrayRangePreWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1PostWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1PreWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1ReferentFieldReadBarrier; -import org.graalvm.compiler.nodes.gc.SerialArrayRangeWriteBarrier; -import org.graalvm.compiler.nodes.gc.SerialWriteBarrier; -import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode; -import org.graalvm.compiler.nodes.java.DynamicNewArrayNode; -import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode; -import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.MonitorEnterNode; -import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.java.MonitorIdNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.NewMultiArrayNode; -import org.graalvm.compiler.nodes.java.RegisterFinalizerNode; -import org.graalvm.compiler.nodes.java.ValidateNewInstanceClassNode; -import org.graalvm.compiler.nodes.memory.FloatingReadNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringProvider; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; -import org.graalvm.compiler.nodes.spi.StampProvider; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.DefaultJavaLoweringProvider; -import org.graalvm.compiler.replacements.IdentityHashCodeSnippets; -import org.graalvm.compiler.replacements.IsArraySnippets; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyWithDelayedLoweringNode; -import org.graalvm.compiler.replacements.nodes.AssertionNode; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.replacements.nodes.LogNode; -import org.graalvm.compiler.serviceprovider.GraalServices; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.TargetDescription; @@ -658,7 +649,7 @@ private void lowerKlassLayoutHelperNode(KlassLayoutHelperNode n, LoweringTool to StructuredGraph graph = n.graph(); assert !n.getHub().isConstant(); AddressNode address = createOffsetAddress(graph, n.getHub(), runtime.getVMConfig().klassLayoutHelperOffset); - n.replaceAtUsagesAndDelete(graph.unique(new FloatingReadNode(address, KLASS_LAYOUT_HELPER_LOCATION, null, n.stamp(NodeView.DEFAULT), null, BarrierType.NONE))); + n.replaceAtUsagesAndDelete(graph.unique(new FloatingReadNode(address, HotSpotReplacementsUtil.KLASS_LAYOUT_HELPER_LOCATION, null, n.stamp(NodeView.DEFAULT), null, BarrierType.NONE))); } private void lowerHubGetClassNode(HubGetClassNode n, LoweringTool tool) { @@ -673,12 +664,12 @@ private void lowerHubGetClassNode(HubGetClassNode n, LoweringTool tool) { AddressNode mirrorAddress = createOffsetAddress(graph, hub, vmConfig.classMirrorOffset); Stamp loadStamp = n.stamp(NodeView.DEFAULT); FloatingReadNode read = graph.unique( - new FloatingReadNode(mirrorAddress, CLASS_MIRROR_LOCATION, null, StampFactory.forKind(target.wordJavaKind), + new FloatingReadNode(mirrorAddress, HotSpotReplacementsUtil.CLASS_MIRROR_LOCATION, null, StampFactory.forKind(target.wordJavaKind), null, BarrierType.NONE)); // Read the Object from the OopHandle AddressNode address = createOffsetAddress(graph, read, 0); - read = graph.unique(new FloatingReadNode(address, HOTSPOT_OOP_HANDLE_LOCATION, null, loadStamp, null, - barrierSet.readBarrierType(HOTSPOT_OOP_HANDLE_LOCATION, address, loadStamp))); + read = graph.unique(new FloatingReadNode(address, HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION, null, loadStamp, null, + barrierSet.readBarrierType(HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION, address, loadStamp))); n.replaceAtUsagesAndDelete(read); } @@ -690,7 +681,7 @@ private void lowerClassGetHubNode(ClassGetHubNode n, LoweringTool tool) { StructuredGraph graph = n.graph(); assert !n.getValue().isConstant(); AddressNode address = createOffsetAddress(graph, n.getValue(), runtime.getVMConfig().klassOffset); - FloatingReadNode read = graph.unique(new FloatingReadNode(address, CLASS_KLASS_LOCATION, null, n.stamp(NodeView.DEFAULT), null, BarrierType.NONE)); + FloatingReadNode read = graph.unique(new FloatingReadNode(address, HotSpotReplacementsUtil.CLASS_KLASS_LOCATION, null, n.stamp(NodeView.DEFAULT), null, BarrierType.NONE)); n.replaceAtUsagesAndDelete(read); } @@ -783,7 +774,7 @@ protected ValueNode createReadArrayComponentHub(StructuredGraph graph, ValueNode guard = AbstractBeginNode.prevBegin(anchor); } AddressNode address = createOffsetAddress(graph, arrayHub, runtime.getVMConfig().arrayClassElementOffset); - return graph.unique(new FloatingReadNode(address, OBJ_ARRAY_KLASS_ELEMENT_KLASS_LOCATION, null, KlassPointerStamp.klassNonNull(), guard)); + return graph.unique(new FloatingReadNode(address, HotSpotReplacementsUtil.OBJ_ARRAY_KLASS_ELEMENT_KLASS_LOCATION, null, KlassPointerStamp.klassNonNull(), guard)); } private void lowerLoadMethodNode(LoadMethodNode loadMethodNode) { @@ -863,7 +854,8 @@ private void lowerOSRStartNode(OSRStartNode osrStart) { // write the displaced mark to the correct stack slot AddressNode addressDisplacedMark = createOffsetAddress(graph, beginLockScope, runtime.getVMConfig().basicLockDisplacedHeaderOffset); - WriteNode writeStackSlot = graph.add(new WriteNode(addressDisplacedMark, DISPLACED_MARK_WORD_LOCATION, loadDisplacedHeader, BarrierType.NONE, MemoryOrderMode.PLAIN)); + WriteNode writeStackSlot = graph.add( + new WriteNode(addressDisplacedMark, HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION, loadDisplacedHeader, BarrierType.NONE, MemoryOrderMode.PLAIN)); graph.addBeforeFixed(migrationEnd, writeStackSlot); // load the lock object from the osr buffer @@ -1012,7 +1004,7 @@ protected ValueNode createReadHub(StructuredGraph graph, ValueNode object, Lower } AddressNode address = createOffsetAddress(graph, object, runtime.getVMConfig().hubOffset); - LocationIdentity hubLocation = runtime.getVMConfig().useCompressedClassPointers ? COMPRESSED_HUB_LOCATION : HUB_LOCATION; + LocationIdentity hubLocation = runtime.getVMConfig().useCompressedClassPointers ? HotSpotReplacementsUtil.COMPRESSED_HUB_LOCATION : HotSpotReplacementsUtil.HUB_LOCATION; FloatingReadNode memoryRead = graph.unique(new FloatingReadNode(address, hubLocation, null, hubStamp, null, BarrierType.NONE)); if (runtime.getVMConfig().useCompressedClassPointers) { return HotSpotCompressionNode.uncompress(graph, memoryRead, runtime.getVMConfig().getKlassEncoding()); @@ -1030,7 +1022,7 @@ private WriteNode createWriteHub(StructuredGraph graph, ValueNode object, ValueN } AddressNode address = createOffsetAddress(graph, object, runtime.getVMConfig().hubOffset); - return graph.add(new WriteNode(address, HUB_WRITE_LOCATION, writeValue, BarrierType.NONE, MemoryOrderMode.PLAIN)); + return graph.add(new WriteNode(address, HotSpotReplacementsUtil.HUB_WRITE_LOCATION, writeValue, BarrierType.NONE, MemoryOrderMode.PLAIN)); } @Override diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java index ce395161fa96..43159d16b3bd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotConstantFieldProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.core.common.spi.JavaConstantFieldProvider; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.options.OptionValues; +import jdk.compiler.graal.core.common.spi.JavaConstantFieldProvider; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.compiler.graal.options.OptionValues; import jdk.vm.ci.hotspot.HotSpotResolvedJavaField; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java index fb2f647bfa75..6fd321405081 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotDisassemblerProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.code.DisassemblerProvider; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +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.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotExceptionDispatchPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotExceptionDispatchPlugin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java index 77f6aa4f7d27..6bb1b73ade68 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotExceptionDispatchPlugin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java @@ -22,38 +22,38 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import static jdk.vm.ci.meta.DeoptimizationAction.None; import static jdk.vm.ci.meta.DeoptimizationReason.TransferToInterpreter; -import static org.graalvm.compiler.hotspot.meta.HotSpotExceptionDispatchPlugin.Options.HotSpotPostOnExceptions; +import static jdk.compiler.graal.hotspot.meta.HotSpotExceptionDispatchPlugin.Options.HotSpotPostOnExceptions; import java.util.function.Supplier; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotCompilationIdentifier; -import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.hotspot.HotSpotCompilationRequest; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java index 9fe633414e96..db1ff87b746a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallDescriptor.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; +import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; import java.util.Arrays; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; +import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor; +import jdk.compiler.graal.core.common.spi.ForeignCallSignature; import org.graalvm.word.LocationIdentity; public class HotSpotForeignCallDescriptor extends ForeignCallDescriptor { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java index 720ae75f745c..8dde68ac3ebf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; +import jdk.compiler.graal.core.common.spi.ForeignCallsProvider; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java index 803345a133a0..5e147cafffa5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotForeignCallsProviderImpl.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java @@ -22,39 +22,33 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCallee; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; +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 org.graalvm.word.LocationIdentity.any; import java.util.function.BiConsumer; +import jdk.compiler.graal.hotspot.replacements.HotSpotReplacementsUtil; import org.graalvm.collections.EconomicMap; import org.graalvm.collections.MapCursor; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition; -import org.graalvm.compiler.hotspot.stubs.ForeignCallStub; -import org.graalvm.compiler.hotspot.stubs.InvokeJavaMethodStub; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.CallingConvention; @@ -71,15 +65,20 @@ public abstract class HotSpotForeignCallsProviderImpl implements HotSpotForeignC public static final LocationIdentity[] NO_LOCATIONS = {}; - public static final HotSpotForeignCallDescriptor OSR_MIGRATION_END = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, "OSR_migration_end", void.class, long.class); - public static final HotSpotForeignCallDescriptor IDENTITY_HASHCODE = new HotSpotForeignCallDescriptor(SAFEPOINT, NOT_REEXECUTABLE, MARK_WORD_LOCATION, "identity_hashcode", int.class, + public static final HotSpotForeignCallDescriptor OSR_MIGRATION_END = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "OSR_migration_end", void.class, long.class); + public static final HotSpotForeignCallDescriptor IDENTITY_HASHCODE = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, HotSpotReplacementsUtil.MARK_WORD_LOCATION, "identity_hashcode", int.class, Object.class); - public static final HotSpotForeignCallDescriptor VERIFY_OOP = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "verify_oop", Object.class, + public static final HotSpotForeignCallDescriptor VERIFY_OOP = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS, "verify_oop", Object.class, Object.class); - public static final HotSpotForeignCallDescriptor LOAD_AND_CLEAR_EXCEPTION = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "load_and_clear_exception", Object.class, + public static final HotSpotForeignCallDescriptor LOAD_AND_CLEAR_EXCEPTION = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "load_and_clear_exception", Object.class, Word.class); - public static final HotSpotForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "test_deoptimize_call_int", int.class, int.class); + public static final HotSpotForeignCallDescriptor TEST_DEOPTIMIZE_CALL_INT = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, any(), "test_deoptimize_call_int", int.class, int.class); protected final HotSpotJVMCIRuntime jvmciRuntime; protected final HotSpotGraalRuntimeProvider runtime; @@ -150,8 +149,8 @@ public HotSpotForeignCallLinkage registerStubCall( public HotSpotForeignCallLinkage registerStubCall( ForeignCallSignature signature, - Transition transition, - Reexecutability reexecutability, + HotSpotForeignCallDescriptor.Transition transition, + HotSpotForeignCallDescriptor.Reexecutability reexecutability, RegisterEffect effect, LocationIdentity... killedLocations) { HotSpotForeignCallDescriptor descriptor = new HotSpotForeignCallDescriptor(signature, transition, reexecutability, killedLocations); @@ -176,7 +175,7 @@ public HotSpotForeignCallLinkage registerForeignCall( throw new IllegalArgumentException("address must be non-zero"); } Class resultType = descriptor.getResultType(); - GraalError.guarantee(descriptor.getTransition() != SAFEPOINT || resultType.isPrimitive() || Word.class.isAssignableFrom(resultType), + GraalError.guarantee(descriptor.getTransition() != HotSpotForeignCallDescriptor.Transition.SAFEPOINT || resultType.isPrimitive() || Word.class.isAssignableFrom(resultType), "non-leaf foreign calls must return objects in thread local storage: %s", descriptor); return register(HotSpotForeignCallLinkageImpl.create(metaAccess, codeCache, @@ -275,7 +274,8 @@ public HotSpotForeignCallDescriptor getDescriptor(ForeignCallSignature signature return descriptor; } - HotSpotForeignCallDescriptor createDescriptor(ForeignCallSignature signature, Transition transition, Reexecutability reexecutability, LocationIdentity... killLocations) { + HotSpotForeignCallDescriptor createDescriptor(ForeignCallSignature signature, HotSpotForeignCallDescriptor.Transition transition, HotSpotForeignCallDescriptor.Reexecutability reexecutability, + LocationIdentity... killLocations) { GraalError.guarantee(!signatureMap.containsKey(signature), "%s", signature); HotSpotForeignCallDescriptor descriptor = new HotSpotForeignCallDescriptor(signature, transition, reexecutability, killLocations); signatureMap.put(signature, descriptor); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotFuzzedSuitesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotFuzzedSuitesProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java index f918d2543138..a105da26b34c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotFuzzedSuitesProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import java.util.Random; -import org.graalvm.compiler.core.phases.fuzzing.FuzzedSuites; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.GraphState.MandatoryStages; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.SuitesProvider; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java index 5a64ad6f3323..6d7e9a06ff68 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraalConstantFieldProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetCounter; +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.vm.ci.meta.JavaConstant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java index 819eef9c4cc1..9dbc507c3fe8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotGraphBuilderPlugins.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java @@ -22,30 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_DECODE_BLOCK; -import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; -import static org.graalvm.compiler.hotspot.HotSpotBackend.CHACHA20Block; -import static org.graalvm.compiler.hotspot.HotSpotBackend.CRC_TABLE_LOCATION; -import static org.graalvm.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.GALOIS_COUNTER_MODE_CRYPT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.POLY1305_PROCESSBLOCKS; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_LANG_THREAD_IS_IN_VTMS_TRANSITION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_IS_IN_TMP_VTMS_TRANSITION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_IS_IN_VTMS_TRANSITION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_VTMS_NOTIFY_JVMTI_EVENTS; -import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing; -import static org.graalvm.compiler.nodes.ConstantNode.forBoolean; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; +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 java.lang.annotation.Annotation; import java.lang.invoke.ConstantCallSite; @@ -58,112 +54,112 @@ import java.math.BigInteger; import java.util.zip.CRC32; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode; -import org.graalvm.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode; -import org.graalvm.compiler.hotspot.replacements.CallSiteTargetNode; -import org.graalvm.compiler.hotspot.replacements.DigestBaseSnippets; -import org.graalvm.compiler.hotspot.replacements.FastNotifyNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotIdentityHashCodeNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotInvocationPluginHelper; -import org.graalvm.compiler.hotspot.replacements.HotSpotReflectionGetCallerClassNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.replacements.HubGetClassNode; -import org.graalvm.compiler.hotspot.replacements.ObjectCloneNode; -import org.graalvm.compiler.hotspot.replacements.UnsafeCopyMemoryNode; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.java.BytecodeParser; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.ComputeObjectAddressNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.MergeNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.ProfileData; -import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.AndNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.calc.IntegerTestNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.SubNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; -import org.graalvm.compiler.nodes.calc.XorNode; -import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.extended.JavaReadNode; -import org.graalvm.compiler.nodes.extended.JavaWriteNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.extended.ObjectIsArrayNode; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.ForeignCallPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration; -import org.graalvm.compiler.nodes.java.ArrayLengthNode; -import org.graalvm.compiler.nodes.java.DynamicNewArrayNode; -import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.Replacements; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.replacements.InlineDuringParsingPlugin; -import org.graalvm.compiler.replacements.IntrinsicGraphBuilder; -import org.graalvm.compiler.replacements.InvocationPluginHelper; -import org.graalvm.compiler.replacements.MethodHandlePlugin; -import org.graalvm.compiler.replacements.NodeIntrinsificationProvider; -import org.graalvm.compiler.replacements.ReplacementsImpl; -import org.graalvm.compiler.replacements.SnippetSubstitutionInvocationPlugin; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins; -import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.AESCryptDelegatePlugin; -import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.CounterModeCryptPlugin; -import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.ReachabilityFencePlugin; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets; -import org.graalvm.compiler.replacements.nodes.AESNode.CryptMode; -import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode; -import org.graalvm.compiler.replacements.nodes.CounterModeAESNode; -import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams; -import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.JavaVersionUtil; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.aarch64.AArch64; @@ -685,7 +681,7 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config try (HotSpotInvocationPluginHelper helper = new HotSpotInvocationPluginHelper(b, targetMethod, config)) { GraalError.guarantee(config.virtualThreadVTMSNotifyJvmtiEvents != -1L, "JvmtiVTMSTransitionDisabler::_VTMS_notify_jvmti_events is not exported"); OffsetAddressNode address = OffsetAddressNode.create(helper.asWord(config.virtualThreadVTMSNotifyJvmtiEvents)); - ValueNode notifyJvmtiEnabled = b.add(new JavaReadNode(JavaKind.Boolean, address, HOTSPOT_VTMS_NOTIFY_JVMTI_EVENTS, BarrierType.NONE, MemoryOrderMode.PLAIN, false)); + ValueNode notifyJvmtiEnabled = b.add(new JavaReadNode(JavaKind.Boolean, address, HotSpotReplacementsUtil.HOTSPOT_VTMS_NOTIFY_JVMTI_EVENTS, BarrierType.NONE, MemoryOrderMode.PLAIN, false)); LogicNode testNotifyJvmtiEnabled = IntegerEqualsNode.create(notifyJvmtiEnabled, ConstantNode.forBoolean(true), NodeView.DEFAULT); StructuredGraph graph = b.getGraph(); @@ -708,12 +704,12 @@ private static void inlineNativeNotifyJvmtiFunctions(GraalHotSpotVMConfig config // VirtualThread object GraalError.guarantee(config.threadIsInVTMSTransitionOffset != -1L, "JavaThread::_is_in_VTMS_transition is not exported"); OffsetAddressNode jtAddress = graph.addOrUniqueWithInputs(new OffsetAddressNode(javaThread, helper.asWord(config.threadIsInVTMSTransitionOffset))); - JavaWriteNode jtWrite = b.add(new JavaWriteNode(JavaKind.Boolean, jtAddress, HOTSPOT_JAVA_THREAD_IS_IN_VTMS_TRANSITION, hide, BarrierType.NONE, false)); + JavaWriteNode jtWrite = b.add(new JavaWriteNode(JavaKind.Boolean, jtAddress, HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_IS_IN_VTMS_TRANSITION, hide, BarrierType.NONE, false)); falseSuccessor.setNext(jtWrite); GraalError.guarantee(config.javaLangThreadIsInVTMSTransitonOffset != -1L, "java_lang_Thread::_jvmti_is_in_VTMS_transition_offset is not exported"); OffsetAddressNode vtAddress = graph.addOrUniqueWithInputs(new OffsetAddressNode(virtualThread, helper.asWord(config.javaLangThreadIsInVTMSTransitonOffset))); - b.add(new JavaWriteNode(JavaKind.Boolean, vtAddress, HOTSPOT_JAVA_LANG_THREAD_IS_IN_VTMS_TRANSITION, hide, BarrierType.NONE, false)); + b.add(new JavaWriteNode(JavaKind.Boolean, vtAddress, HotSpotReplacementsUtil.HOTSPOT_JAVA_LANG_THREAD_IS_IN_VTMS_TRANSITION, hide, BarrierType.NONE, false)); EndNode falseSuccessorEnd = b.add(new EndNode()); @@ -777,7 +773,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec GraalError.guarantee(config.threadIsInTmpVTMSTransitionOffset != -1L, "JavaThread::_is_in_tmp_VTMS_transition is not exported"); CurrentJavaThreadNode javaThread = b.add(new CurrentJavaThreadNode(helper.getWordKind())); OffsetAddressNode address = b.add(new OffsetAddressNode(javaThread, helper.asWord(config.threadIsInTmpVTMSTransitionOffset))); - b.add(new JavaWriteNode(JavaKind.Boolean, address, HOTSPOT_JAVA_THREAD_IS_IN_TMP_VTMS_TRANSITION, hide, BarrierType.NONE, false)); + b.add(new JavaWriteNode(JavaKind.Boolean, address, HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_IS_IN_TMP_VTMS_TRANSITION, hide, BarrierType.NONE, false)); } } return true; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java similarity index 63% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java index e526307d051c..7f808ea8dd18 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotHostForeignCallsProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java @@ -22,135 +22,124 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.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 org.graalvm.compiler.core.target.Backend.ARITHMETIC_DREM; -import static org.graalvm.compiler.core.target.Backend.ARITHMETIC_FREM; -import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_DECODE_BLOCK; -import static org.graalvm.compiler.hotspot.HotSpotBackend.BASE64_ENCODE_BLOCK; -import static org.graalvm.compiler.hotspot.HotSpotBackend.BIGINTEGER_LEFT_SHIFT_WORKER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.BIGINTEGER_RIGHT_SHIFT_WORKER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.CHACHA20Block; -import static org.graalvm.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_DECRYPT_AESCRYPT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.ELECTRONIC_CODEBOOK_ENCRYPT_AESCRYPT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.GALOIS_COUNTER_MODE_CRYPT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.IC_MISS_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.MD5_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_MULTIPLY; -import static org.graalvm.compiler.hotspot.HotSpotBackend.MONTGOMERY_SQUARE; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; -import static org.graalvm.compiler.hotspot.HotSpotBackend.POLY1305_PROCESSBLOCKS; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA2_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA3_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA5_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_END; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_MOUNT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_START; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHAREDRUNTIME_NOTIFY_JVMTI_VTHREAD_UNMOUNT; -import static org.graalvm.compiler.hotspot.HotSpotBackend.SHA_IMPL_COMPRESS_MB; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UNWIND_EXCEPTION_TO_CALLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_ADLER32; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32; -import static org.graalvm.compiler.hotspot.HotSpotBackend.UPDATE_BYTES_CRC32C; -import static org.graalvm.compiler.hotspot.HotSpotBackend.VM_ERROR; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.COMPUTES_REGISTERS_KILLED; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNPACK_WITH_EXCEPTION_IN_TLS; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.ENABLE_STACK_RESERVED_ZONE; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.POLLING_PAGE_RETURN_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.THROW_DELAYED_STACKOVERFLOW_ERROR; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE; -import static org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE_OR_NULL; -import static org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets.G1WBPOSTCALL; -import static org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets.G1WBPRECALL; -import static org.graalvm.compiler.hotspot.replacements.HotSpotG1WriteBarrierSnippets.VALIDATE_OBJECT; -import static org.graalvm.compiler.hotspot.replacements.Log.LOG_OBJECT; -import static org.graalvm.compiler.hotspot.replacements.Log.LOG_PRIMITIVE; -import static org.graalvm.compiler.hotspot.replacements.Log.LOG_PRINTF; -import static org.graalvm.compiler.hotspot.replacements.MonitorSnippets.MONITORENTER; -import static org.graalvm.compiler.hotspot.replacements.MonitorSnippets.MONITOREXIT; -import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.EXCEPTION_HANDLER_FOR_PC; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; -import static org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub.EXCEPTION_HANDLER_FOR_RETURN_ADDRESS; -import static org.graalvm.compiler.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER; -import static org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates.findMethod; -import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN; -import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN; +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 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 org.graalvm.collections.EconomicMap; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallSignature; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.replacements.arraycopy.CheckcastArrayCopyCallNode; -import org.graalvm.compiler.hotspot.stubs.ArrayStoreExceptionStub; -import org.graalvm.compiler.hotspot.stubs.ClassCastExceptionStub; -import org.graalvm.compiler.hotspot.stubs.CreateExceptionStub; -import org.graalvm.compiler.hotspot.stubs.DivisionByZeroExceptionStub; -import org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub; -import org.graalvm.compiler.hotspot.stubs.IllegalArgumentExceptionArgumentIsNotAnArrayStub; -import org.graalvm.compiler.hotspot.stubs.IntegerExactOverflowExceptionStub; -import org.graalvm.compiler.hotspot.stubs.IntrinsicStubsGen; -import org.graalvm.compiler.hotspot.stubs.LongExactOverflowExceptionStub; -import org.graalvm.compiler.hotspot.stubs.NegativeArraySizeExceptionStub; -import org.graalvm.compiler.hotspot.stubs.NullPointerExceptionStub; -import org.graalvm.compiler.hotspot.stubs.OutOfBoundsExceptionStub; -import org.graalvm.compiler.hotspot.stubs.SnippetStub; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.hotspot.stubs.UnwindExceptionToCallerStub; -import org.graalvm.compiler.hotspot.stubs.VerifyOopStub; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.StringLatin1InflateNode; -import org.graalvm.compiler.replacements.StringUTF16CompressNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls; -import org.graalvm.compiler.replacements.nodes.AESNode; -import org.graalvm.compiler.replacements.nodes.ArrayCompareToForeignCalls; -import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsForeignCalls; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsForeignCalls; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsWithMaskForeignCalls; -import org.graalvm.compiler.replacements.nodes.ArrayIndexOfForeignCalls; -import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToForeignCalls; -import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode; -import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode; -import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode; -import org.graalvm.compiler.replacements.nodes.CalcStringAttributesForeignCalls; -import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode; -import org.graalvm.compiler.replacements.nodes.CountPositivesNode; -import org.graalvm.compiler.replacements.nodes.CounterModeAESNode; -import org.graalvm.compiler.replacements.nodes.EncodeArrayNode; -import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode; -import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.CodeCacheProvider; @@ -164,32 +153,43 @@ */ public abstract class HotSpotHostForeignCallsProvider extends HotSpotForeignCallsProviderImpl implements ArrayCopyForeignCalls { - public static final HotSpotForeignCallDescriptor JAVA_TIME_MILLIS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "javaTimeMillis", long.class); - public static final HotSpotForeignCallDescriptor JAVA_TIME_NANOS = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, REEXECUTABLE, NO_LOCATIONS, "javaTimeNanos", long.class); + public static final HotSpotForeignCallDescriptor JAVA_TIME_MILLIS = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS, "javaTimeMillis", long.class); + public static final HotSpotForeignCallDescriptor JAVA_TIME_NANOS = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS, "javaTimeNanos", long.class); - public static final HotSpotForeignCallDescriptor NOTIFY = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "object_notify", int.class, Word.class, Object.class); - public static final HotSpotForeignCallDescriptor NOTIFY_ALL = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, any(), "object_notifyAll", int.class, Word.class, Object.class); + public static final HotSpotForeignCallDescriptor NOTIFY = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "object_notify", int.class, Word.class, Object.class); + public static final HotSpotForeignCallDescriptor NOTIFY_ALL = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any(), "object_notifyAll", int.class, Word.class, Object.class); - public static final HotSpotForeignCallDescriptor INVOKE_STATIC_METHOD_ONE_ARG = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, + public static final HotSpotForeignCallDescriptor INVOKE_STATIC_METHOD_ONE_ARG = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS, "JVMCIRuntime::invoke_static_method_one_arg", long.class, Word.class, Word.class, long.class); - public static final HotSpotForeignCallDescriptor NMETHOD_ENTRY_BARRIER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, "nmethod_entry_barrier", void.class); + public static final HotSpotForeignCallDescriptor NMETHOD_ENTRY_BARRIER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "nmethod_entry_barrier", void.class); /* * Functions from ZBarrierSetRuntime. The weak_ prefix refers to AS_NO_KEEPALIVE while the extra * word before oop_field part refers to java.lang.Reference subclass and corresponds to * ON_WEAK_OOP_REF/ON_PHANTOM_OOP_REF in HotSpot decorator terminology. */ - public static final HotSpotForeignCallDescriptor Z_FIELD_BARRIER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, "load_barrier_on_oop_field_preloaded", + public static final HotSpotForeignCallDescriptor Z_FIELD_BARRIER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "load_barrier_on_oop_field_preloaded", long.class, long.class, long.class); - public static final HotSpotForeignCallDescriptor Z_REFERENCE_GET_BARRIER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, + public static final HotSpotForeignCallDescriptor Z_REFERENCE_GET_BARRIER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "load_barrier_on_weak_oop_field_preloaded", long.class, long.class, long.class); - public static final HotSpotForeignCallDescriptor Z_WEAK_REFERS_TO_BARRIER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, + public static final HotSpotForeignCallDescriptor Z_WEAK_REFERS_TO_BARRIER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "weak_load_barrier_on_weak_oop_field_preloaded", long.class, long.class, long.class); - public static final HotSpotForeignCallDescriptor Z_PHANTOM_REFERS_TO_BARRIER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, + public static final HotSpotForeignCallDescriptor Z_PHANTOM_REFERS_TO_BARRIER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "weak_load_barrier_on_phantom_oop_field_preloaded", long.class, long.class, long.class); - public static final HotSpotForeignCallDescriptor Z_ARRAY_BARRIER = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, NO_LOCATIONS, "load_barrier_on_oop_array", + public static final HotSpotForeignCallDescriptor Z_ARRAY_BARRIER = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, NO_LOCATIONS, "load_barrier_on_oop_array", void.class, long.class, long.class); /** @@ -226,7 +226,8 @@ public static class TestForeignCalls { public static HotSpotForeignCallDescriptor createStubCallDescriptor(JavaKind kind) { String name = kind.isObject() ? "objectReturnsObject" : kind.getJavaName() + "Returns" + capitalize(kind.getJavaName()); Class javaClass = kind.isObject() ? Object.class : kind.toJavaClass(); - return new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, NO_LOCATIONS, name, javaClass, javaClass); + return new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS, name, javaClass, + javaClass); } static boolean booleanReturnsBoolean(boolean arg) { @@ -360,7 +361,8 @@ private ForeignCallDescriptor buildDescriptor(JavaKind kind, boolean aligned, bo boolean killAny = killedLocation.isAny(); boolean killInit = killedLocation.isInit(); String name = kind + (aligned ? "Aligned" : "") + (disjoint ? "Disjoint" : "") + (uninit ? "Uninit" : "") + "Arraycopy" + (killInit ? "KillInit" : killAny ? "KillAny" : ""); - HotSpotForeignCallDescriptor desc = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, killedLocation, name, void.class, Word.class, Word.class, Word.class); + HotSpotForeignCallDescriptor desc = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, + killedLocation, name, void.class, Word.class, Word.class, Word.class); registerForeignCall(desc, routine, NativeCall); return desc; } @@ -375,7 +377,8 @@ private void registerCheckcastArraycopyDescriptor(boolean uninit, long routine) // c_rarg4 - oop ckval (super_klass) // return: 0 = success, n = number of copied elements xor'd with -1. LocationIdentity killed = NamedLocationIdentity.any(); - HotSpotForeignCallDescriptor desc = new HotSpotForeignCallDescriptor(LEAF_NO_VZERO, NOT_REEXECUTABLE, killed, name, int.class, Word.class, Word.class, Word.class, Word.class, + HotSpotForeignCallDescriptor desc = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, + killed, name, int.class, Word.class, Word.class, Word.class, Word.class, Word.class); registerForeignCall(desc, routine, NativeCall); checkcastArraycopyDescriptors[uninit ? 1 : 0] = desc; @@ -447,8 +450,10 @@ public void initialize(HotSpotProviders providers, OptionValues options) { registerMathStubs(c, providers, options); - registerForeignCall(createDescriptor(ARITHMETIC_FREM, LEAF, REEXECUTABLE, NO_LOCATIONS), c.fremAddress, NativeCall); - registerForeignCall(createDescriptor(ARITHMETIC_DREM, LEAF, REEXECUTABLE, NO_LOCATIONS), c.dremAddress, NativeCall); + registerForeignCall(createDescriptor(ARITHMETIC_FREM, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), c.fremAddress, + NativeCall); + registerForeignCall(createDescriptor(ARITHMETIC_DREM, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), c.dremAddress, + NativeCall); registerForeignCall(LOAD_AND_CLEAR_EXCEPTION, c.loadAndClearExceptionAddress, NativeCall); @@ -462,13 +467,13 @@ public void initialize(HotSpotProviders providers, OptionValues options) { linkForeignCall(options, providers, NEW_INSTANCE, c.newInstanceAddress, PREPEND_THREAD); linkForeignCall(options, providers, NEW_ARRAY, c.newArrayAddress, PREPEND_THREAD); linkForeignCall(options, providers, NEW_MULTI_ARRAY, c.newMultiArrayAddress, PREPEND_THREAD); - linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE, c.dynamicNewInstanceAddress, PREPEND_THREAD); + linkForeignCall(options, providers, HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE, c.dynamicNewInstanceAddress, PREPEND_THREAD); if (c.areNullAllocationStubsAvailable()) { linkForeignCall(options, providers, NEW_INSTANCE_OR_NULL, c.newInstanceOrNullAddress, PREPEND_THREAD); linkForeignCall(options, providers, NEW_ARRAY_OR_NULL, c.newArrayOrNullAddress, PREPEND_THREAD); linkForeignCall(options, providers, NEW_MULTI_ARRAY_OR_NULL, c.newMultiArrayOrNullAddress, PREPEND_THREAD); - linkForeignCall(options, providers, DYNAMIC_NEW_INSTANCE_OR_NULL, c.dynamicNewInstanceOrNullAddress, PREPEND_THREAD); + linkForeignCall(options, providers, HotSpotAllocationSnippets.DYNAMIC_NEW_INSTANCE_OR_NULL, c.dynamicNewInstanceOrNullAddress, PREPEND_THREAD); } if (c.supportJVMTIVThreadNotification()) { @@ -485,29 +490,39 @@ public void initialize(HotSpotProviders providers, OptionValues options) { EnumMap exceptionRuntimeCalls = DefaultHotSpotLoweringProvider.RuntimeCalls.runtimeCalls; link(new ArrayStoreExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.ARRAY_STORE), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.ARRAY_STORE), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new ClassCastExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.CLASS_CAST), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.CLASS_CAST), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new NullPointerExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NULL_POINTER), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NULL_POINTER), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new OutOfBoundsExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.OUT_OF_BOUNDS), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.OUT_OF_BOUNDS), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new NegativeArraySizeExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new DivisionByZeroExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.DIVISION_BY_ZERO), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.DIVISION_BY_ZERO), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new IntegerExactOverflowExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.INTEGER_EXACT_OVERFLOW), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new LongExactOverflowExceptionStub(options, providers, - registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.LONG_EXACT_OVERFLOW), SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.LONG_EXACT_OVERFLOW), HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); link(new IllegalArgumentExceptionArgumentIsNotAnArrayStub(options, providers, registerStubCall(exceptionRuntimeCalls.get(BytecodeExceptionKind.ILLEGAL_ARGUMENT_EXCEPTION_ARGUMENT_IS_NOT_AN_ARRAY), - SAFEPOINT, NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); + HotSpotForeignCallDescriptor.Transition.SAFEPOINT, HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, DESTROYS_ALL_CALLER_SAVE_REGISTERS, any()))); linkForeignCall(options, providers, IDENTITY_HASHCODE, c.identityHashCodeAddress, PREPEND_THREAD); - linkForeignCall(options, providers, createDescriptor(REGISTER_FINALIZER, SAFEPOINT, NOT_REEXECUTABLE, any()), c.registerFinalizerAddress, PREPEND_THREAD); - linkForeignCall(options, providers, MONITORENTER, c.monitorenterAddress, PREPEND_THREAD); - linkForeignCall(options, providers, MONITOREXIT, c.monitorexitAddress, PREPEND_THREAD); + linkForeignCall(options, providers, + createDescriptor(REGISTER_FINALIZER, HotSpotForeignCallDescriptor.Transition.SAFEPOINT, HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, any()), + c.registerFinalizerAddress, PREPEND_THREAD); + linkForeignCall(options, providers, MonitorSnippets.MONITORENTER, c.monitorenterAddress, PREPEND_THREAD); + linkForeignCall(options, providers, MonitorSnippets.MONITOREXIT, c.monitorexitAddress, PREPEND_THREAD); registerForeignCall(NOTIFY, c.notifyAddress, NativeCall); registerForeignCall(NOTIFY_ALL, c.notifyAllAddress, NativeCall); @@ -533,14 +548,14 @@ public void initialize(HotSpotProviders providers, OptionValues options) { register(Z_ARRAY_BARRIER.getSignature()); } - linkForeignCall(options, providers, LOG_PRINTF, c.logPrintfAddress, PREPEND_THREAD); - linkForeignCall(options, providers, LOG_OBJECT, c.logObjectAddress, PREPEND_THREAD); - linkForeignCall(options, providers, LOG_PRIMITIVE, c.logPrimitiveAddress, PREPEND_THREAD); + linkForeignCall(options, providers, Log.LOG_PRINTF, c.logPrintfAddress, PREPEND_THREAD); + linkForeignCall(options, providers, Log.LOG_OBJECT, c.logObjectAddress, PREPEND_THREAD); + linkForeignCall(options, providers, Log.LOG_PRIMITIVE, c.logPrimitiveAddress, PREPEND_THREAD); linkForeignCall(options, providers, VM_ERROR, c.vmErrorAddress, PREPEND_THREAD); linkForeignCall(options, providers, OSR_MIGRATION_END, c.osrMigrationEndAddress, DONT_PREPEND_THREAD); - linkForeignCall(options, providers, G1WBPRECALL, c.writeBarrierPreAddress, PREPEND_THREAD); - linkForeignCall(options, providers, G1WBPOSTCALL, c.writeBarrierPostAddress, PREPEND_THREAD); - linkForeignCall(options, providers, VALIDATE_OBJECT, c.validateObject, PREPEND_THREAD); + linkForeignCall(options, providers, HotSpotG1WriteBarrierSnippets.G1WBPRECALL, c.writeBarrierPreAddress, PREPEND_THREAD); + linkForeignCall(options, providers, HotSpotG1WriteBarrierSnippets.G1WBPOSTCALL, c.writeBarrierPostAddress, PREPEND_THREAD); + linkForeignCall(options, providers, HotSpotG1WriteBarrierSnippets.VALIDATE_OBJECT, c.validateObject, PREPEND_THREAD); linkForeignCall(options, providers, TEST_DEOPTIMIZE_CALL_INT, c.testDeoptimizeCallInt, PREPEND_THREAD); @@ -558,8 +573,10 @@ public void initialize(HotSpotProviders providers, OptionValues options) { registerCheckcastArraycopyDescriptor(true, c.checkcastArraycopyUninit); registerCheckcastArraycopyDescriptor(false, c.checkcastArraycopy); - registerForeignCall(createDescriptor(GENERIC_ARRAYCOPY, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.any()), c.genericArraycopy, NativeCall); - registerForeignCall(createDescriptor(UNSAFE_ARRAYCOPY, LEAF_NO_VZERO, NOT_REEXECUTABLE, NamedLocationIdentity.any()), c.unsafeArraycopy, NativeCall); + registerForeignCall(createDescriptor(GENERIC_ARRAYCOPY, HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, + NamedLocationIdentity.any()), c.genericArraycopy, NativeCall); + registerForeignCall(createDescriptor(UNSAFE_ARRAYCOPY, HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO, HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE, + NamedLocationIdentity.any()), c.unsafeArraycopy, NativeCall); if (c.md5ImplCompressMultiBlock != 0L) { registerForeignCall(MD5_IMPL_COMPRESS_MB, c.md5ImplCompressMultiBlock, NativeCall); @@ -626,13 +643,20 @@ public void initialize(HotSpotProviders providers, OptionValues options) { @SuppressWarnings("unused") protected void registerMathStubs(GraalHotSpotVMConfig hotSpotVMConfig, HotSpotProviders providers, OptionValues options) { - registerForeignCall(createDescriptor(SIN.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticSinAddress, NativeCall); - registerForeignCall(createDescriptor(COS.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticCosAddress, NativeCall); - registerForeignCall(createDescriptor(TAN.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticTanAddress, NativeCall); - registerForeignCall(createDescriptor(EXP.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticExpAddress, NativeCall); - registerForeignCall(createDescriptor(LOG.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticLogAddress, NativeCall); - registerForeignCall(createDescriptor(LOG10.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticLog10Address, NativeCall); - registerForeignCall(createDescriptor(POW.foreignCallSignature, LEAF, REEXECUTABLE, NO_LOCATIONS), hotSpotVMConfig.arithmeticPowAddress, NativeCall); + registerForeignCall(createDescriptor(SIN.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticSinAddress, NativeCall); + registerForeignCall(createDescriptor(COS.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticCosAddress, NativeCall); + registerForeignCall(createDescriptor(TAN.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticTanAddress, NativeCall); + registerForeignCall(createDescriptor(EXP.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticExpAddress, NativeCall); + registerForeignCall(createDescriptor(LOG.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticLogAddress, NativeCall); + registerForeignCall(createDescriptor(LOG10.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticLog10Address, NativeCall); + registerForeignCall(createDescriptor(POW.foreignCallSignature, HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, NO_LOCATIONS), + hotSpotVMConfig.arithmeticPowAddress, NativeCall); } private void registerSnippetStubs(HotSpotProviders providers, OptionValues options) { @@ -669,8 +693,10 @@ protected interface SnippetStubConstructor { protected void linkSnippetStubs(HotSpotProviders providers, OptionValues options, SnippetStubConstructor constructor, ForeignCallDescriptor... stubs) { for (ForeignCallDescriptor stub : stubs) { - HotSpotForeignCallDescriptor.Reexecutability reexecutability = stub.isReexecutable() ? REEXECUTABLE : NOT_REEXECUTABLE; - link(constructor.apply(options, providers, registerStubCall(stub.getSignature(), LEAF, reexecutability, COMPUTES_REGISTERS_KILLED, stub.getKilledLocations()))); + HotSpotForeignCallDescriptor.Reexecutability reexecutability = stub.isReexecutable() ? HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE + : HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; + link(constructor.apply(options, providers, + registerStubCall(stub.getSignature(), HotSpotForeignCallDescriptor.Transition.LEAF, reexecutability, COMPUTES_REGISTERS_KILLED, stub.getKilledLocations()))); } } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPluginProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPluginProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java index d01137c4d2eb..25bd433bf647 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPluginProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java @@ -22,16 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.spi.Replacements; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins; +import jdk.compiler.graal.nodes.spi.Replacements; +import jdk.compiler.graal.serviceprovider.ServiceProvider; import jdk.vm.ci.code.Architecture; /** * Allows adding additional invocation plugins to {@link HotSpotGraphBuilderPlugins} via - * {@link org.graalvm.compiler.serviceprovider.ServiceProvider}. + * {@link ServiceProvider}. */ public interface HotSpotInvocationPluginProvider { void registerInvocationPlugins(Architecture architecture, InvocationPlugins plugins, Replacements replacements); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java index aeb7a08b4052..428b09d3b867 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotInvocationPlugins.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; -import static org.graalvm.compiler.hotspot.HotSpotGraalServices.isIntrinsicAvailable; +import static jdk.compiler.graal.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 org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.replacements.nodes.MacroInvokable; +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.vm.ci.hotspot.VMIntrinsicMethod; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotJITClassInitializationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotJITClassInitializationPlugin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java index a6a760c221b2..6af9d48c6512 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotJITClassInitializationPlugin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import static org.graalvm.compiler.bytecode.Bytecodes.GETSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.NEW; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC; +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 java.util.function.Supplier; -import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; +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.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.ConstantPool; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotLoadedSuitesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotLoadedSuitesProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java index 0fccc2a74a9d..ce9b9477a823 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotLoadedSuitesProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.core.phases.fuzzing.PhasePlanSerializer; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.SuitesProvider; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java index 46b3627f9db9..e85e75dd8ecc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotLoweringProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.Extensions; -import org.graalvm.compiler.hotspot.replacements.ObjectCloneSnippets; -import org.graalvm.compiler.hotspot.stubs.ForeignCallSnippets; -import org.graalvm.compiler.nodes.spi.LoweringProvider; -import org.graalvm.compiler.options.OptionValues; +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; /** * HotSpot implementation of {@link LoweringProvider}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java index 7dc1fdf7533c..5a41f005bc7f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotMetaAccessExtensionProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; +import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java index f83388e6bcf6..fec386a109f5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotNodePlugin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; - -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.TypePlugin; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordOperationPlugin; +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; import jdk.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java index 1edab4cf62e9..a613d8c91088 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotPlatformConfigurationProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; +import jdk.compiler.graal.hotspot.GraalHotSpotVMConfig; +import jdk.compiler.graal.nodes.gc.BarrierSet; +import jdk.compiler.graal.nodes.spi.PlatformConfigurationProvider; public class HotSpotPlatformConfigurationProvider implements PlatformConfigurationProvider { private final BarrierSet barrierSet; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java index bb4c9507238c..2fa1cb076b99 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotProviders.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; - -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.core.common.spi.ConstantFieldProvider; -import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.spi.LoopsDataProvider; -import org.graalvm.compiler.nodes.spi.LoweringProvider; -import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider; -import org.graalvm.compiler.nodes.spi.Replacements; -import org.graalvm.compiler.nodes.spi.StampProvider; -import org.graalvm.compiler.phases.tiers.SuitesProvider; -import org.graalvm.compiler.phases.util.Providers; +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; import jdk.vm.ci.hotspot.HotSpotCodeCacheProvider; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java index 048e3a099667..4b2306e8cc6c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotRegisters.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java index 4ad815a38af3..8f7289724069 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotRegistersProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java index 8a97cb59073a..ea58b610588c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotSnippetReflectionProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import static jdk.vm.ci.hotspot.HotSpotJVMCIRuntime.runtime; @@ -30,12 +30,12 @@ import java.lang.reflect.Field; import java.util.Objects; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.SnippetObjectConstant; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.hotspot.HotSpotConstantReflectionProvider; import jdk.vm.ci.hotspot.HotSpotObjectConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java index 1a8ac110ae89..c968beb3cb02 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotStampProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.nodes.type.MethodPointerStamp; -import org.graalvm.compiler.nodes.spi.StampProvider; +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; public class HotSpotStampProvider implements StampProvider { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java index 43e14ea8afad..fdd11406cd97 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotSuitesProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import java.util.ListIterator; import java.util.Optional; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntime; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotGraphBuilderPhase; -import org.graalvm.compiler.hotspot.lir.HotSpotZapRegistersPhase; -import org.graalvm.compiler.hotspot.lir.VerifyMaxRegisterSizePhase; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.java.SuitesProviderBase; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.EncodedGraph; -import org.graalvm.compiler.nodes.GraphEncoder; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.SimplifyingGraphDecoder; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.common.AddressLoweringPhase; -import org.graalvm.compiler.phases.common.BarrierSetVerificationPhase; -import org.graalvm.compiler.phases.common.UseTrappingNullChecksPhase; -import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.LowTierContext; -import org.graalvm.compiler.phases.tiers.MidTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.SuitesCreator; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java index fd5d356de995..a4ab15636ba1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/HotSpotWordOperationPlugin.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java @@ -22,42 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; -import static org.graalvm.compiler.nodes.ConstantNode.forBoolean; +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 org.graalvm.word.LocationIdentity.any; -import org.graalvm.compiler.api.replacements.SnippetReflectionProvider; -import org.graalvm.compiler.bytecode.BridgeMethodUtils; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.nodes.LoadIndexedPointerNode; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.nodes.type.MetaspacePointerStamp; -import org.graalvm.compiler.hotspot.nodes.type.MethodPointerStamp; -import org.graalvm.compiler.hotspot.word.HotSpotOperation; -import org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode; -import org.graalvm.compiler.hotspot.word.PointerCastNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.calc.PointerEqualsNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.word.WordOperationPlugin; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java index d1fc45a8007e..7fbdfbdbd6d4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/meta/UnimplementedGraalIntrinsics.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.meta; +package jdk.compiler.graal.hotspot.meta; import java.util.Arrays; import java.util.Collection; @@ -30,8 +30,8 @@ import java.util.Set; import java.util.TreeSet; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; +import jdk.compiler.graal.debug.GraalError; +import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin; /** * This class documents unimplemented Graal intrinsics and categorizes them into 3 categories: diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java index 9ac99dd64b2d..710a77b723f1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/AcquiredCASLockNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; /** * Marks the control flow path where an object acquired a lightweight lock based on an atomic diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java index fc6a8d079766..f0de4d933345 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/AllocaNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java index cfb0768cb499..b53bf4209abe 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/BeginLockScopeNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.InputType.Memory; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +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 org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.extended.MonitorEnter; -import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java index 0a21b7187279..62ec62999a8b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/CurrentJavaThreadNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.code.Register; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java index fe609707ed10..78ee00bc8d25 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/CurrentLockNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java index 9a947aeb0e6e..017167f6972b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeCallerNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ControlSinkNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java index c43505ad6f08..1be94a1ef116 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; - -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8; - -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotLIRGenerator; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ControlSinkNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java index 811ccc2e0091..4cdc8b5c96b4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/DeoptimizingStubCall.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; +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; @NodeInfo(cycles = CYCLES_UNKNOWN, size = SIZE_UNKNOWN) public abstract class DeoptimizingStubCall extends DeoptimizingFixedWithNextNode { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java index 9dbfee3645aa..b28c4b9fef39 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/EndLockScopeNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.InputType.Memory; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +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 org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.extended.MonitorExit; -import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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 org.graalvm.word.LocationIdentity; /** diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java index 6c64149b6e2c..88dfe0c52bfe 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/FastAcquireBiasedLockNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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; /** * Marks the control flow path where an object acquired a biased lock because the lock was already diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java index e0b6d14a8443..2a50174833a0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotCompressionNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.nodes.type.HotSpotNarrowOopStamp; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; +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.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java index adf46f5f9029..5fe88235f550 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotDirectCallTargetNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.DirectCallTargetNode; -import org.graalvm.compiler.nodes.ValueNode; +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.vm.ci.code.CallingConvention.Type; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java index 54faabbfff0c..baed49060f41 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotIndirectCallTargetNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.IndirectCallTargetNode; -import org.graalvm.compiler.nodes.ValueNode; +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.vm.ci.code.CallingConvention.Type; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotLoadReservedReferenceNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java similarity index 75% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotLoadReservedReferenceNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java index 0b6135e54c39..f997020fdb8d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotLoadReservedReferenceNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.extended.JavaReadNode; -import org.graalvm.compiler.nodes.memory.FloatableThreadLocalAccess; -import org.graalvm.compiler.nodes.memory.MemoryAccess; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotStoreReservedReferenceNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotStoreReservedReferenceNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java index ab103487717c..4da622bf9ceb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/HotSpotStoreReservedReferenceNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode.JVMCI_RESERVED_REFERENCE; +import static jdk.compiler.graal.hotspot.nodes.HotSpotLoadReservedReferenceNode.JVMCI_RESERVED_REFERENCE; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.AbstractStateSplit; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.JavaWriteNode; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.word.WordTypes; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java index 6e265ffbfc0a..de59b39fcb09 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ControlSinkNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; +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; /** * Sets up the {@linkplain HotSpotBackend#EXCEPTION_HANDLER_IN_CALLER arguments} expected by an diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java similarity index 74% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java index 5b0ce1b1a177..6836d631eca1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/JumpToExceptionHandlerNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder; -import org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; +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; /** * Jumps to the exception handler specified by {@link #address}. This node is specific for the diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java index ae37fb3ecb50..baad33ea53f3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/KlassBeingInitializedCheckNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.Lowerable; +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; @NodeInfo(cycles = CYCLES_4, size = SIZE_16) public class KlassBeingInitializedCheckNode extends DeoptimizingFixedWithNextNode implements Lowerable { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java index 0af6ac27291c..520a4d01f1c0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/LoadIndexedPointerNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java index 30691aa7a182..adb42a2dfb70 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/MonitorCounterNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java similarity index 75% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java index 6797a0304d97..47d4b2aba78d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/PatchReturnAddressNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.HotSpotNodeLIRBuilder; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.word.Word; +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; /** * Modifies the return address of the current frame. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java index e3cbb9678eef..619ba5509fd0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/StubForeignCallNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java @@ -22,30 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.InputType.Memory; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; -import static org.graalvm.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE; -import static org.graalvm.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE; +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 java.util.Arrays; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.graph.NodeInputList; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.memory.MultiMemoryKill; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java index 7d6848dbeb28..1e4402ec0e37 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/StubStartNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.stubs.Stub; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.StartNode; +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; /** * Start node for a {@link Stub}'s graph. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java index 0826802f23ad..e7ded3ed82bf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/VMErrorNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; +package jdk.compiler.graal.hotspot.nodes; -import static org.graalvm.compiler.hotspot.HotSpotBackend.VM_ERROR; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +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 org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; -import org.graalvm.compiler.replacements.nodes.CStringConstant; +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.vm.ci.code.CodeUtil; import jdk.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/VirtualThreadUpdateJFRNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/VirtualThreadUpdateJFRNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java index a49be4076e06..c291710b911d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/VirtualThreadUpdateJFRNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes; - -import static org.graalvm.compiler.nodeinfo.InputType.Memory; - -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.Lowerable; +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; import org.graalvm.word.LocationIdentity; @NodeInfo(allowedUsageTypes = Memory, cycles = NodeCycles.CYCLES_32, size = NodeSize.SIZE_32) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java index 90543aac9468..a705107632ac 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/HotSpotNarrowOopStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes.type; +package jdk.compiler.graal.hotspot.nodes.type; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.type.AbstractObjectStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.nodes.CompressionNode.CompressionOp; -import org.graalvm.compiler.nodes.type.NarrowOopStamp; +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.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java index 9b25ef1cbf92..466299ed9a77 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/KlassPointerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes.type; +package jdk.compiler.graal.hotspot.nodes.type; import java.util.Objects; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.Stamp; +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.vm.ci.hotspot.HotSpotCompressedNullConstant; import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java index 608079a81e93..f4eca4a28b70 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MetaspacePointerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes.type; +package jdk.compiler.graal.hotspot.nodes.type; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.GraalError; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java index f2edbe88e9a9..00fa30d803ed 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MethodCountersPointerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes.type; +package jdk.compiler.graal.hotspot.nodes.type; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.Stamp; +import jdk.compiler.graal.core.common.type.AbstractPointerStamp; +import jdk.compiler.graal.core.common.type.Stamp; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java index d28317be5fad..f8c9d6dfc989 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/nodes/type/MethodPointerStamp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.nodes.type; +package jdk.compiler.graal.hotspot.nodes.type; -import org.graalvm.compiler.core.common.type.AbstractPointerStamp; -import org.graalvm.compiler.core.common.type.Stamp; +import jdk.compiler.graal.core.common.type.AbstractPointerStamp; +import jdk.compiler.graal.core.common.type.Stamp; import jdk.vm.ci.hotspot.HotSpotMemoryAccessProvider; import jdk.vm.ci.hotspot.HotSpotMetaspaceConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/package-info.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/package-info.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/package-info.java index 19ff69352ec2..b83cfcbeab27 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/package-info.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/package-info.java @@ -22,4 +22,4 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot; +package jdk.compiler.graal.hotspot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java index fb0b202e6eae..f30a57a3db4a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/phases/OnStackReplacementPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java @@ -22,63 +22,63 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.phases; +package jdk.compiler.graal.hotspot.phases; -import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required; +import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required; import java.util.BitSet; import java.util.Optional; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.cfg.Loop; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.hotspot.HotSpotGraalServices; -import org.graalvm.compiler.loop.phases.LoopTransformations; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.EntryMarkerNode; -import org.graalvm.compiler.nodes.EntryProxyNode; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.StartNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.cfg.HIRBlock; -import org.graalvm.compiler.nodes.extended.OSRLocalNode; -import org.graalvm.compiler.nodes.extended.OSRLockNode; -import org.graalvm.compiler.nodes.extended.OSRMonitorEnterNode; -import org.graalvm.compiler.nodes.extended.OSRStartNode; -import org.graalvm.compiler.nodes.java.AccessMonitorNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.java.MonitorEnterNode; -import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.java.MonitorIdNode; -import org.graalvm.compiler.nodes.loop.LoopEx; -import org.graalvm.compiler.nodes.loop.LoopsData; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup; +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.vm.ci.meta.DeoptimizationAction; import jdk.vm.ci.meta.DeoptimizationReason; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java similarity index 69% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java index f06789b99508..ea378f8618d5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/AssertionSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.api.directives.GraalDirectives.SLOWPATH_PROBABILITY; -import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.hotspot.nodes.StubStartNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.AssertionNode; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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; public class AssertionSnippets implements Snippets { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java index d2ad31e6a511..fa837bfbfaea 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/CallSiteTargetNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.replacements.nodes.MacroNode; +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.vm.ci.hotspot.HotSpotObjectConstant; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java index 3d05e7d1701a..7f47308d161f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ClassGetHubNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java @@ -22,34 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; - -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; - -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConvertNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.extended.GetClassNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.nodes.spi.Lowerable; +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; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java index 2b39159280e8..c8373f746d92 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/DigestBaseSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.nodes.java.InstanceOfNode.doInstanceof; +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 org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.nodes.ComputeObjectAddressNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.ReplacementsUtil; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.FallbackInvokeWithExceptionNode; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java index aad533d282e2..5033f4f55964 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/FastNotifyNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.nodeinfo.InputType.Memory; -import static org.graalvm.compiler.nodeinfo.InputType.State; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +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 org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.DeoptimizingNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.Lowerable; +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 org.graalvm.word.LocationIdentity; @NodeInfo(cycles = CYCLES_2, size = SIZE_0, allowedUsageTypes = Memory) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java index dbc2f1d091aa..996cebb0ddf4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotAllocationSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java @@ -22,102 +22,102 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions.MinimalBulkZeroingSize; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_ARRAY_OR_NULL; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_INSTANCE_OR_NULL; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY; -import static org.graalvm.compiler.hotspot.HotSpotBackend.NEW_MULTI_ARRAY_OR_NULL; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_STATE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_INIT_THREAD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HUB_WRITE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.PROTOTYPE_MARK_WORD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_END_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.TLAB_TOP_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.arrayKlassOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.instanceKlassStateBeingInitialized; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.isInstanceKlassFullyInitialized; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeMask; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperHeaderSizeShift; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeMask; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.layoutHelperLog2ElementSizeShift; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadKlassFromObject; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readInstanceKlassInitState; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readInstanceKlassInitThread; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readLayoutHelper; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.ProfileAllocations; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.ProfileAllocationsContext; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.VM_MESSAGE_C; -import static org.graalvm.compiler.nodes.PiArrayNode.piArrayCastToSnippetReplaceeStamp; -import static org.graalvm.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.replacements.ReplacementsUtil.dynamicAssert; -import static org.graalvm.compiler.replacements.ReplacementsUtil.staticAssert; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; - -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter; -import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.nodes.KlassBeingInitializedCheckNode; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.debug.DynamicCounterNode; -import org.graalvm.compiler.nodes.debug.VerifyHeapNode; -import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.java.DynamicNewArrayNode; -import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.NewMultiArrayNode; -import org.graalvm.compiler.nodes.java.ValidateNewInstanceClassNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.AllocationSnippets; -import org.graalvm.compiler.replacements.SnippetCounter; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.UnsignedWord; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java index b140f67c2d48..b7b7370f8da3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; - -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF_NO_VZERO; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; - -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.nodes.HotSpotCompressionNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.gc.G1ArrayRangePostWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1ArrayRangePreWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1PostWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1PreWriteBarrier; -import org.graalvm.compiler.nodes.gc.G1ReferentFieldReadBarrier; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.ReplacementsUtil; -import org.graalvm.compiler.replacements.SnippetCounter.Group; -import org.graalvm.compiler.replacements.SnippetCounter.Group.Factory; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.gc.G1WriteBarrierSnippets; -import org.graalvm.compiler.word.Word; +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; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java similarity index 71% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java index 02dbca3e09fa..0ddfc378a47a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotHashCodeSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.IDENTITY_HASHCODE; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.identityHashCode; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.identityHashCodeShift; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.lockMaskInPlace; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.markOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.uninitializedIdentityHashCodeValue; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; +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 org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.replacements.IdentityHashCodeSnippets; -import org.graalvm.compiler.word.Word; +import jdk.compiler.graal.lir.SyncPort; +import jdk.compiler.graal.replacements.IdentityHashCodeSnippets; +import jdk.compiler.graal.word.Word; import org.graalvm.word.WordFactory; // @formatter:off diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotIdentityHashCodeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotIdentityHashCodeNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java index e371fae752e8..1e3346c2d46c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotIdentityHashCodeNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeCycles; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodeinfo.NodeSize; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.replacements.nodes.IdentityHashCodeNode; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.hotspot.HotSpotObjectConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java index f5daad95aef7..062b58f51ea2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotInvocationPluginHelper.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java @@ -22,46 +22,46 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; - -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.ARRAY_KLASS_COMPONENT_MIRROR; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.CLASS_ARRAY_KLASS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CURRENT_THREAD_OOP_HANDLE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_JAVA_THREAD_SCOPED_VALUE_CACHE_HANDLE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_OOP_HANDLE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CARRIER_THREAD_OBJECT_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CURRENT_THREAD_OBJECT_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_OSTHREAD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_SCOPED_VALUE_CACHE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_MODIFIER_FLAGS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_KLASS_LOCATION; +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; import java.util.function.Function; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode; -import org.graalvm.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.memory.ReadNode; -import org.graalvm.compiler.nodes.memory.WriteNode; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.replacements.InvocationPluginHelper; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotIsArraySnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotIsArraySnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java index 960f81500e89..7cc159eb68ce 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotIsArraySnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassIsArray; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; +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 org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.replacements.IsArraySnippets; +import jdk.compiler.graal.hotspot.word.KlassPointer; +import jdk.compiler.graal.nodes.SnippetAnchorNode; +import jdk.compiler.graal.replacements.IsArraySnippets; public class HotSpotIsArraySnippets extends IsArraySnippets { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java index 82088d818246..20d9d8d26cc1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.replacements.nodes.ReflectionGetCallerClassNode; +import jdk.compiler.graal.graph.NodeClass; +import jdk.compiler.graal.nodeinfo.NodeInfo; +import jdk.compiler.graal.replacements.nodes.ReflectionGetCallerClassNode; import jdk.vm.ci.hotspot.HotSpotResolvedJavaMethod; import jdk.vm.ci.meta.MetaAccessProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java index d45e7f412851..274b6be8c396 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotReplacementsUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java @@ -22,44 +22,44 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.VERIFY_OOP; +import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.compiler.graal.hotspot.meta.HotSpotForeignCallsProviderImpl.VERIFY_OOP; import java.lang.ref.Reference; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.core.common.SuppressFBWarnings; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.CanonicalizableLocation; -import org.graalvm.compiler.nodes.CompressionNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.extended.LoadHubOrNullNode; -import org.graalvm.compiler.nodes.extended.RawLoadNode; -import org.graalvm.compiler.nodes.extended.StoreHubNode; -import org.graalvm.compiler.nodes.memory.AddressableMemoryAccess; -import org.graalvm.compiler.nodes.memory.address.AddressNode; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.replacements.ReplacementsUtil; -import org.graalvm.compiler.replacements.nodes.ReadRegisterNode; -import org.graalvm.compiler.serviceprovider.JavaVersionUtil; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java index 5790b512e7ef..83ee4fbd49d4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.gc.SerialArrayRangeWriteBarrier; -import org.graalvm.compiler.nodes.gc.SerialWriteBarrier; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.ReplacementsUtil; -import org.graalvm.compiler.replacements.SnippetCounter.Group; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.gc.SerialWriteBarrierSnippets; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.WordFactory; public class HotSpotSerialWriteBarrierSnippets extends SerialWriteBarrierSnippets { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java index 0a2b4a11cd3f..c98dc7a235c1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HotspotSnippetsOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java @@ -22,13 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets.ProfileContext; -import org.graalvm.compiler.options.EnumOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionKey; +import jdk.compiler.graal.options.EnumOptionKey; +import jdk.compiler.graal.options.Option; +import jdk.compiler.graal.options.OptionType; +import jdk.compiler.graal.options.OptionKey; /** * Options related to HotSpot snippets in this package. @@ -54,7 +53,7 @@ public class HotspotSnippetsOptions { public static final OptionKey ProfileAllocations = new OptionKey<>(false); @Option(help = "file:doc-files/ProfileAllocationsContextHelp.txt", type = OptionType.Debug) - public static final EnumOptionKey ProfileAllocationsContext = new EnumOptionKey<>(ProfileContext.AllocatingMethod); + public static final EnumOptionKey ProfileAllocationsContext = new EnumOptionKey<>(HotSpotAllocationSnippets.ProfileContext.AllocatingMethod); @Option(help = "Enable profiling of monitor operations.", type = OptionType.Debug) public static final OptionKey ProfileMonitors = new OptionKey<>(false); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java index bfd277389fe1..656a310928b6 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/HubGetClassNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ConvertNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.extended.HubGetClassNodeInterface; -import org.graalvm.compiler.nodes.spi.Lowerable; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.ConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java index 8c96d2c9cda9..b5bbdbc3b16c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/InstanceOfSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java @@ -22,58 +22,58 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile; import static jdk.vm.ci.meta.DeoptimizationReason.OptimizedTypeCheckViolated; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubOrNullIntrinsic; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMaxHints; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.TypeCheckMinProfileHitProbability; -import static org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.checkSecondarySubType; -import static org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.checkUnknownSubType; -import static org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.createHints; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.unknownProbability; +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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter; -import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.Counters; -import org.graalvm.compiler.hotspot.replacements.TypeCheckSnippetUtils.Hints; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.TypeCheckHints; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode; -import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.InstanceOfSnippetsTemplates; -import org.graalvm.compiler.replacements.SnippetCounter; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.ExplodeLoopNode; +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.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java index f2fba1403a65..5f08cb70cb62 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/KlassLayoutHelperNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.spi.Lowerable; +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.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java similarity index 68% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java index f38ae92942f5..98da9263fb67 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/LoadExceptionObjectSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java @@ -22,36 +22,36 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.LOAD_AND_CLEAR_EXCEPTION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_OOP_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.EXCEPTION_PC_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.LoadExceptionObjectInVM; -import static org.graalvm.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.ReadRegisterNode; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.WordFactory; import jdk.vm.ci.code.BytecodeFrame; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/Log.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/Log.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/Log.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/Log.java index b45150f6028a..7fe3e19d5f27 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/Log.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/Log.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS; -import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; +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 java.io.PrintStream; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.word.Word; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/LogSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/LogSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java index 667e2597b5f3..82d2ebbf849a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/LogSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.replacements.nodes.LogNode; -import org.graalvm.compiler.word.Word; +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; /** * Collection of snippets to lower {@link LogNode} with different input edge constellations. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java index 15aebf9ba5b1..20c9691fa264 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/MonitorSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java @@ -22,66 +22,58 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; - -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.NOT_REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.STACK_INSPECTABLE_LEAF; -import static org.graalvm.compiler.hotspot.nodes.AcquiredCASLockNode.mark; -import static org.graalvm.compiler.hotspot.nodes.BeginLockScopeNode.beginLockScope; -import static org.graalvm.compiler.hotspot.nodes.EndLockScopeNode.endLockScope; -import static org.graalvm.compiler.hotspot.nodes.VMErrorNode.vmError; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_LOCK_STACK_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_LOCK_STACK_TOP_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.MARK_WORD_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_CXQ_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_ENTRY_LIST_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_OWNER_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_RECURSION_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.OBJECT_MONITOR_SUCC_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.diagnoseSyncOnValueBasedClasses; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.heldMonitorCountOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.isCAssertEnabled; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaThreadLockStackEndOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaThreadLockStackTopOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jvmAccIsValueBasedClass; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassAccessFlagsOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadWordFromObject; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.lockDisplacedMarkOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.lockMaskInPlace; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.markOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.monitorMask; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorAnonymousOwner; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorCxqOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorEntryListOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorOwnerOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorRecursionsOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.objectMonitorSuccOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.pageSize; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.unlockedMask; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.useLightweightLocking; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.useStackLocking; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.verifyOop; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.wordSize; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.ProfileMonitors; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.TraceMonitorsMethodFilter; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.TraceMonitorsTypeFilter; -import static org.graalvm.compiler.hotspot.replacements.HotspotSnippetsOptions.VerifyBalancedMonitors; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.nodes.extended.MembarNode.memoryBarrier; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +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; import static org.graalvm.word.LocationIdentity.any; import static org.graalvm.word.WordFactory.unsigned; import static org.graalvm.word.WordFactory.zero; @@ -89,52 +81,52 @@ import java.util.List; import java.util.Objects; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.nodes.CurrentLockNode; -import org.graalvm.compiler.hotspot.nodes.MonitorCounterNode; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.debug.DynamicCounterNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.extended.MembarNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.MonitorEnterNode; -import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.inlining.InliningUtil; -import org.graalvm.compiler.replacements.SnippetCounter; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordBase; @@ -199,7 +191,7 @@ public class MonitorSnippets implements Snippets { @Snippet public static void monitorenter(Object object, KlassPointer hub, @ConstantParameter int lockDepth, @ConstantParameter Register threadRegister, @ConstantParameter Register stackPointerRegister, @ConstantParameter boolean trace, @ConstantParameter Counters counters) { - verifyOop(object); + HotSpotReplacementsUtil.verifyOop(object); // Load the mark word - this includes a null-check on object final Word mark = loadWordFromObject(object, markOffset(INJECTED_VMCONFIG)); @@ -212,8 +204,9 @@ public static void monitorenter(Object object, KlassPointer hub, @ConstantParame incCounter(); - if (diagnoseSyncOnValueBasedClasses(INJECTED_VMCONFIG)) { - if (hub.readWord(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION).and(jvmAccIsValueBasedClass(INJECTED_VMCONFIG)).notEqual(0)) { + if (HotSpotReplacementsUtil.diagnoseSyncOnValueBasedClasses(INJECTED_VMCONFIG)) { + if (hub.readWord(HotSpotReplacementsUtil.klassAccessFlagsOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION).and( + HotSpotReplacementsUtil.jvmAccIsValueBasedClass(INJECTED_VMCONFIG)).notEqual(0)) { monitorenterStubC(MONITORENTER, object, lock); return; } @@ -243,18 +236,18 @@ private static boolean tryFastPathLocking(Object object, Register stackPointerRe private static boolean tryEnterInflated(Object object, Word lock, Word mark, Word thread, boolean trace, Counters counters) { // Set the lock slot's displaced mark to unused. Any non-0 value suffices. - lock.writeWord(lockDisplacedMarkOffset(INJECTED_VMCONFIG), WordFactory.unsigned(3), DISPLACED_MARK_WORD_LOCATION); + lock.writeWord(HotSpotReplacementsUtil.lockDisplacedMarkOffset(INJECTED_VMCONFIG), WordFactory.unsigned(3), HotSpotReplacementsUtil.DISPLACED_MARK_WORD_LOCATION); // mark is a pointer to the ObjectMonitor + monitorMask - Word monitor = mark.subtract(monitorMask(INJECTED_VMCONFIG)); - int ownerOffset = objectMonitorOwnerOffset(INJECTED_VMCONFIG); - Word owner = monitor.readWord(ownerOffset, OBJECT_MONITOR_OWNER_LOCATION); + Word monitor = mark.subtract(HotSpotReplacementsUtil.monitorMask(INJECTED_VMCONFIG)); + int ownerOffset = HotSpotReplacementsUtil.objectMonitorOwnerOffset(INJECTED_VMCONFIG); + Word owner = monitor.readWord(ownerOffset, HotSpotReplacementsUtil.OBJECT_MONITOR_OWNER_LOCATION); // The following owner null check is essential. In the case where the null check fails, it // avoids the subsequent bound-to-fail CAS operation, which would have caused the // invalidation of the L1 cache of the core that runs the lock owner thread, and thus causes // the lock to be held slightly longer. if (probability(FREQUENT_PROBABILITY, owner.equal(0))) { // it appears unlocked (owner == 0) - if (probability(FREQUENT_PROBABILITY, monitor.logicCompareAndSwapWord(ownerOffset, owner, thread, OBJECT_MONITOR_OWNER_LOCATION))) { + if (probability(FREQUENT_PROBABILITY, monitor.logicCompareAndSwapWord(ownerOffset, owner, thread, HotSpotReplacementsUtil.OBJECT_MONITOR_OWNER_LOCATION))) { // success traceObject(trace, "+lock{inflated:cas}", object, true); counters.inflatedCas.inc(); @@ -264,9 +257,9 @@ private static boolean tryEnterInflated(Object object, Word lock, Word mark, Wor counters.inflatedFailedCas.inc(); } } else if (probability(NOT_LIKELY_PROBABILITY, owner.equal(thread))) { - int recursionsOffset = objectMonitorRecursionsOffset(INJECTED_VMCONFIG); - Word recursions = monitor.readWord(recursionsOffset, OBJECT_MONITOR_RECURSION_LOCATION); - monitor.writeWord(recursionsOffset, recursions.add(1), OBJECT_MONITOR_RECURSION_LOCATION); + int recursionsOffset = HotSpotReplacementsUtil.objectMonitorRecursionsOffset(INJECTED_VMCONFIG); + Word recursions = monitor.readWord(recursionsOffset, HotSpotReplacementsUtil.OBJECT_MONITOR_RECURSION_LOCATION); + monitor.writeWord(recursionsOffset, recursions.add(1), HotSpotReplacementsUtil.OBJECT_MONITOR_RECURSION_LOCATION); traceObject(trace, "+lock{inflated:recursive}", object, true); counters.inflatedRecursive.inc(); return true; @@ -558,8 +551,8 @@ private static void decrementHeldMonitorCount(Word thread) { } private static void updateHeldMonitorCount(Word thread, int increment) { - Word heldMonitorCount = thread.readWord(heldMonitorCountOffset(INJECTED_VMCONFIG), JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION); - thread.writeWord(heldMonitorCountOffset(INJECTED_VMCONFIG), heldMonitorCount.add(increment), JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION); + Word heldMonitorCount = thread.readWord(HotSpotReplacementsUtil.heldMonitorCountOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION); + thread.writeWord(HotSpotReplacementsUtil.heldMonitorCountOffset(INJECTED_VMCONFIG), heldMonitorCount.add(increment), HotSpotReplacementsUtil.JAVA_THREAD_HOLD_MONITOR_COUNT_LOCATION); } @Fold @@ -588,7 +581,7 @@ private static void trace(boolean enabled, String format, WordBase value) { @Fold static boolean verifyBalancedMonitors(@Fold.InjectedParameter OptionValues options) { - return VerifyBalancedMonitors.getValue(options); + return HotspotSnippetsOptions.VerifyBalancedMonitors.getValue(options); } static void incCounter() { @@ -756,7 +749,7 @@ public void lower(MonitorExitNode monitorexitNode, HotSpotRegistersProvider regi public static boolean isTracingEnabledForType(ValueNode object) { ResolvedJavaType type = StampTool.typeOrNull(object.stamp(NodeView.DEFAULT)); - String filter = TraceMonitorsTypeFilter.getValue(object.getOptions()); + String filter = HotspotSnippetsOptions.TraceMonitorsTypeFilter.getValue(object.getOptions()); if (filter == null) { return false; } else { @@ -771,7 +764,7 @@ public static boolean isTracingEnabledForType(ValueNode object) { } public static boolean isTracingEnabledForMethod(StructuredGraph graph) { - String filter = TraceMonitorsMethodFilter.getValue(graph.getOptions()); + String filter = HotspotSnippetsOptions.TraceMonitorsMethodFilter.getValue(graph.getOptions()); if (filter == null) { return false; } else { @@ -790,7 +783,7 @@ public static boolean isTracingEnabledForMethod(StructuredGraph graph) { * return points of the graph to initialize and check the monitor counter respectively. */ private void checkBalancedMonitors(StructuredGraph graph, LoweringTool tool) { - if (VerifyBalancedMonitors.getValue(options)) { + if (HotspotSnippetsOptions.VerifyBalancedMonitors.getValue(options)) { NodeIterable nodes = graph.getNodes().filter(MonitorCounterNode.class); if (nodes.isEmpty()) { // Only insert the nodes if this is the first monitorenter being lowered. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java index 9b6005d4c93a..eff739e968b0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java @@ -22,41 +22,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; import java.util.Collections; import java.util.List; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.InliningLog; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.nodes.spi.Replacements; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode; -import org.graalvm.compiler.nodes.virtual.CommitAllocationNode; -import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode; -import org.graalvm.compiler.nodes.virtual.VirtualObjectNode; -import org.graalvm.compiler.phases.common.inlining.InliningUtil; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.nodes.BasicObjectCloneNode; -import org.graalvm.compiler.replacements.nodes.MacroInvokable; -import org.graalvm.compiler.replacements.nodes.ObjectClone; +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.vm.ci.meta.Assumptions; import jdk.vm.ci.meta.ResolvedJavaField; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java index 02cee860a191..f4375fa4e46d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectCloneSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; import java.util.EnumMap; -import org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.java.DynamicNewArrayNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; +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.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java index 8cea22578268..7ac58c796873 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/ObjectSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +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 org.graalvm.collections.UnmodifiableEconomicMap; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.word.Word; +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; public class ObjectSnippets implements Snippets { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/RegisterFinalizerSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java similarity index 60% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/RegisterFinalizerSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java index 6e2cee5360d2..db4455289c2c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/RegisterFinalizerSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java @@ -22,29 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jvmAccHasFinalizer; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.klassAccessFlagsOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHub; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; +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 org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.java.LoweredRegisterFinalizerNode; -import org.graalvm.compiler.nodes.java.RegisterFinalizerNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; +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; /** * Performs conditional finalizer registration via a runtime call. The condition will be constant @@ -56,8 +52,9 @@ public class RegisterFinalizerSnippets implements Snippets { @Snippet public static void registerFinalizerSnippet(final Object thisObj) { - KlassPointer klass = loadHub(thisObj); - if (probability(SLOW_PATH_PROBABILITY, (klass.readInt(klassAccessFlagsOffset(INJECTED_VMCONFIG), KLASS_ACCESS_FLAGS_LOCATION) & jvmAccHasFinalizer(INJECTED_VMCONFIG)) != 0)) { + KlassPointer klass = HotSpotReplacementsUtil.loadHub(thisObj); + if (probability(SLOW_PATH_PROBABILITY, (klass.readInt(HotSpotReplacementsUtil.klassAccessFlagsOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.KLASS_ACCESS_FLAGS_LOCATION) & + HotSpotReplacementsUtil.jvmAccHasFinalizer(INJECTED_VMCONFIG)) != 0)) { LoweredRegisterFinalizerNode.registerFinalizer(thisObj); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java similarity index 71% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java index fa0ac12d079e..4d978a82a020 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/StringToBytesSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java @@ -22,29 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_METAACCESS; -import static org.graalvm.compiler.replacements.ReplacementsUtil.getArrayBaseOffset; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +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 org.graalvm.compiler.api.directives.GraalDirectives; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.debug.StringToBytesNode; -import org.graalvm.compiler.nodes.extended.RawStoreNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java similarity index 67% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java index 3a36d08b05d6..9ff6c8e10640 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/TypeCheckSnippetUtils.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java @@ -22,34 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; - -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.KLASS_SUPER_CHECK_OFFSET_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.METASPACE_ARRAY_LENGTH_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPERS_ELEMENT_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPERS_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.metaspaceArrayBaseOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.metaspaceArrayLengthOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.secondarySuperCacheOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.secondarySupersOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.superCheckOffsetOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.wordSize; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; +package jdk.compiler.graal.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 java.util.Arrays; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.TypeCheckHints; -import org.graalvm.compiler.replacements.SnippetCounter; -import org.graalvm.compiler.replacements.SnippetCounter.Group; -import org.graalvm.compiler.word.Word; +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.vm.ci.hotspot.HotSpotResolvedObjectType; import jdk.vm.ci.meta.MetaAccessProvider; @@ -63,7 +51,7 @@ public class TypeCheckSnippetUtils { static boolean checkSecondarySubType(KlassPointer t, KlassPointer sNonNull, Counters counters) { // if (S.cache == T) return true - if (sNonNull.readKlassPointer(secondarySuperCacheOffset(INJECTED_VMCONFIG), SECONDARY_SUPER_CACHE_LOCATION).equal(t)) { + if (sNonNull.readKlassPointer(HotSpotReplacementsUtil.secondarySuperCacheOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION).equal(t)) { counters.cacheHit.inc(); return true; } @@ -73,11 +61,11 @@ static boolean checkSecondarySubType(KlassPointer t, KlassPointer sNonNull, Coun static boolean checkUnknownSubType(KlassPointer t, KlassPointer sNonNull, Counters counters) { // int off = T.offset - int superCheckOffset = t.readInt(superCheckOffsetOffset(INJECTED_VMCONFIG), KLASS_SUPER_CHECK_OFFSET_LOCATION); - boolean primary = superCheckOffset != secondarySuperCacheOffset(INJECTED_VMCONFIG); + int superCheckOffset = t.readInt(HotSpotReplacementsUtil.superCheckOffsetOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.KLASS_SUPER_CHECK_OFFSET_LOCATION); + boolean primary = superCheckOffset != HotSpotReplacementsUtil.secondarySuperCacheOffset(INJECTED_VMCONFIG); // if (T = S[off]) return true - if (sNonNull.readKlassPointer(superCheckOffset, PRIMARY_SUPERS_LOCATION).equal(t)) { + if (sNonNull.readKlassPointer(superCheckOffset, HotSpotReplacementsUtil.PRIMARY_SUPERS_LOCATION).equal(t)) { if (primary) { counters.cacheHit.inc(); } else { @@ -103,11 +91,11 @@ private static boolean checkSelfAndSupers(KlassPointer t, KlassPointer s, Counte } // if (S.scan_s_s_array(T)) { S.cache = T; return true; } - Word secondarySupers = s.readWord(secondarySupersOffset(INJECTED_VMCONFIG), SECONDARY_SUPERS_LOCATION); - int length = secondarySupers.readInt(metaspaceArrayLengthOffset(INJECTED_VMCONFIG), METASPACE_ARRAY_LENGTH_LOCATION); + Word secondarySupers = s.readWord(HotSpotReplacementsUtil.secondarySupersOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.SECONDARY_SUPERS_LOCATION); + int length = secondarySupers.readInt(HotSpotReplacementsUtil.metaspaceArrayLengthOffset(INJECTED_VMCONFIG), HotSpotReplacementsUtil.METASPACE_ARRAY_LENGTH_LOCATION); for (int i = 0; i < length; i++) { if (probability(NOT_LIKELY_PROBABILITY, t.equal(loadSecondarySupersElement(secondarySupers, i)))) { - s.writeKlassPointer(secondarySuperCacheOffset(INJECTED_VMCONFIG), t, SECONDARY_SUPER_CACHE_LOCATION); + s.writeKlassPointer(HotSpotReplacementsUtil.secondarySuperCacheOffset(INJECTED_VMCONFIG), t, HotSpotReplacementsUtil.SECONDARY_SUPER_CACHE_LOCATION); counters.secondariesHit.inc(); return true; } @@ -187,6 +175,7 @@ static Hints createHints(TypeCheckHints hints, MetaAccessProvider metaAccess, bo } static KlassPointer loadSecondarySupersElement(Word metaspaceArray, int index) { - return KlassPointer.fromWord(metaspaceArray.readWord(metaspaceArrayBaseOffset(INJECTED_VMCONFIG) + index * wordSize(), SECONDARY_SUPERS_ELEMENT_LOCATION)); + return KlassPointer.fromWord(metaspaceArray.readWord(HotSpotReplacementsUtil.metaspaceArrayBaseOffset(INJECTED_VMCONFIG) + index * HotSpotReplacementsUtil.wordSize(), + HotSpotReplacementsUtil.SECONDARY_SUPERS_ELEMENT_LOCATION)); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java index 6447d25cbd9e..34a2d431dcd1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/UnsafeCopyMemoryNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.nodeinfo.InputType.Memory; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16; +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 org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.AbstractStateSplit; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.memory.MemoryAccess; -import org.graalvm.compiler.nodes.memory.MemoryKill; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.Lowerable; +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 org.graalvm.word.LocationIdentity; @NodeInfo(cycles = CYCLES_64, size = SIZE_16, allowedUsageTypes = {Memory}) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java similarity index 73% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java index 04cc5ac1edcf..1c1f1a712f49 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/UnsafeSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java @@ -22,26 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; +package jdk.compiler.graal.hotspot.replacements; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.doingUnsafeAccessOffset; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; +import static jdk.compiler.graal.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; +import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode; -import org.graalvm.compiler.nodes.ComputeObjectAddressNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.WordFactory; @@ -56,7 +55,7 @@ static void copyMemory(Object receiver, Object srcBase, long srcOffset, Object d Word dstAddr = WordFactory.unsigned(ComputeObjectAddressNode.get(destBase, destOffset)); Word size = WordFactory.signed(bytes); Word javaThread = CurrentJavaThreadNode.get(); - int offset = doingUnsafeAccessOffset(INJECTED_VMCONFIG); + int offset = HotSpotReplacementsUtil.doingUnsafeAccessOffset(INJECTED_VMCONFIG); LocationIdentity any = LocationIdentity.any(); /* Set doingUnsafeAccess to guard and handle unsafe memory access failures */ diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java similarity index 73% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java index 347e95f0d2d4..367c743cc097 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.replacements; - -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.HOTSPOT_CARRIER_THREAD_OOP_HANDLE_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.JAVA_THREAD_CARRIER_THREAD_OBJECT_LOCATION; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaLangThreadJFREpochOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.javaLangThreadTIDOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadEpochOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadExcludedOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadIDOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.jfrThreadLocalVthreadOffset; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.threadCarrierThreadOffset; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; -import static org.graalvm.compiler.nodes.extended.MembarNode.memoryBarrier; -import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER; -import static org.graalvm.compiler.word.Word.objectToTrackedPointer; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.nodes.VirtualThreadUpdateJFRNode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.extended.MembarNode; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.Arguments; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.word.Word; +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; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java index d87cbd7b3514..30d38337f189 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java @@ -23,37 +23,37 @@ * questions. */ //JaCoCo Exclude -package org.graalvm.compiler.hotspot.replacements.arraycopy; - -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; - -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.PrimitiveStamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.GetObjectAddressNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.IntegerConvertNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.WordTypes; +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; import org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.CodeUtil; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java index 4e2a1ef0da2b..116f447d403c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java @@ -23,27 +23,26 @@ * questions. */ //JaCoCo Exclude -package org.graalvm.compiler.hotspot.replacements.arraycopy; +package jdk.compiler.graal.hotspot.replacements.arraycopy; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.GENERIC_ARRAYCOPY; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN; -import org.graalvm.compiler.core.common.spi.ForeignCallsProvider; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.nodeinfo.InputType; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.GetObjectAddressNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.extended.ForeignCallNode; -import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint; -import org.graalvm.compiler.nodes.memory.SingleMemoryKill; -import org.graalvm.compiler.nodes.spi.Lowerable; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.meta.JavaKind; @@ -105,7 +104,7 @@ public void lower(LoweringTool tool) { StructuredGraph graph = graph(); ValueNode srcAddr = objectAddress(getSource()); ValueNode destAddr = objectAddress(getDestination()); - ForeignCallNode call = graph.add(new ForeignCallNode(getForeignCalls(), GENERIC_ARRAYCOPY, srcAddr, srcPos, destAddr, destPos, length)); + ForeignCallNode call = graph.add(new ForeignCallNode(getForeignCalls(), HotSpotHostForeignCallsProvider.GENERIC_ARRAYCOPY, srcAddr, srcPos, destAddr, destPos, length)); call.setStateAfter(stateAfter()); graph.replaceFixedWithFixed(this, call); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java index c0c97d31f414..bbfe258e5e13 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java @@ -23,21 +23,21 @@ * questions. */ -package org.graalvm.compiler.hotspot.replacements.arraycopy; - -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability; - -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopyCallNode; -import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets; -import org.graalvm.compiler.word.Word; +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; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt similarity index 100% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotBackendFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotBackendFactory.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java index ee0555eb146b..16f4a7de8de7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotBackendFactory.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java @@ -22,43 +22,43 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.riscv64; +package jdk.compiler.graal.hotspot.riscv64; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil; -import org.graalvm.compiler.core.riscv64.ShadowedRISCV64; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotBackendFactory; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; -import org.graalvm.compiler.hotspot.meta.AddressLoweringHotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotGraphBuilderPlugins; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegisters; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSnippetReflectionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.java.DefaultSuitesCreator; -import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.gc.BarrierSet; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.common.AddressLoweringPhase; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.serviceprovider.ServiceProvider; +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.vm.ci.code.Architecture; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java index 672a70b698d8..4a8dc8f72374 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.riscv64; +package jdk.compiler.graal.hotspot.riscv64; import static jdk.vm.ci.meta.Value.ILLEGAL; -import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER; -import static org.graalvm.compiler.hotspot.HotSpotBackend.EXCEPTION_HANDLER_IN_CALLER; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.JUMP_ADDRESS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; +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 org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.riscv64.ShadowedRISCV64; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.word.HotSpotWordTypes; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.CallingConvention; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java similarity index 71% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java index 7e310130e2a9..d2e2416bb9e1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java @@ -22,24 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.riscv64; +package jdk.compiler.graal.hotspot.riscv64; -import org.graalvm.compiler.core.riscv64.RISCV64LoweringProviderMixin; -import org.graalvm.compiler.debug.DebugHandlersFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider; -import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotMetaAccessExtensionProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotPlatformConfigurationProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider; -import org.graalvm.compiler.hotspot.replacements.HotSpotAllocationSnippets; -import org.graalvm.compiler.hotspot.replacements.arraycopy.HotSpotArraycopySnippets; -import org.graalvm.compiler.nodes.spi.LoweringTool; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.hotspot.HotSpotConstantReflectionProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java index 655508e1aa45..6b128fe5cb4e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.riscv64; +package jdk.compiler.graal.hotspot.riscv64; -import org.graalvm.compiler.hotspot.HotSpotGraphBuilderPhase; -import org.graalvm.compiler.java.DefaultSuitesCreator; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; +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; public class RISCV64HotSpotSuitesCreator extends DefaultSuitesCreator { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/AbstractForeignCallStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/AbstractForeignCallStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java index c75e1ef7c790..b573b4d56b69 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/AbstractForeignCallStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java @@ -22,42 +22,36 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.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 org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl.StackOnlyCallingConvention.StackOnlyCall; -import static org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl.StackOnlyCallingConvention.StackOnlyCallee; -import static org.graalvm.compiler.nodes.ConstantNode.forBoolean; +import static jdk.compiler.graal.nodes.ConstantNode.forBoolean; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.JavaMethodContext; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl; -import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition; -import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.stubs.ForeignCallSnippets.Templates; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.GraphKit; -import org.graalvm.compiler.replacements.nodes.ReadRegisterNode; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.hotspot.HotSpotSignature; @@ -69,11 +63,11 @@ import jdk.vm.ci.meta.Signature; /** - * A {@linkplain #getGraph generated} stub for a {@link Transition non-leaf} foreign call from - * compiled code. A stub is required for such calls as the caller may be scheduled for - * deoptimization while the call is in progress. And since these are foreign/runtime calls on slow - * paths, we don't want to force the register allocator to spill around the call. As such, this stub - * saves and restores all allocatable registers. It also + * A {@linkplain #getGraph generated} stub for a {@link HotSpotForeignCallDescriptor.Transition + * non-leaf} foreign call from compiled code. A stub is required for such calls as the caller may be + * scheduled for deoptimization while the call is in progress. And since these are foreign/runtime + * calls on slow paths, we don't want to force the register allocator to spill around the call. As + * such, this stub saves and restores all allocatable registers. It also * {@linkplain ForeignCallSnippets#handlePendingException handles} any exceptions raised during the * foreign call. */ @@ -115,8 +109,8 @@ public AbstractForeignCallStub(OptionValues options, descriptor, 0L, effect, - effect == KILLS_NO_REGISTERS ? StackOnlyCall : JavaCall, - effect == KILLS_NO_REGISTERS ? StackOnlyCallee : JavaCallee)); + effect == HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS ? HotSpotForeignCallLinkageImpl.StackOnlyCallingConvention.StackOnlyCall : JavaCall, + effect == HotSpotForeignCallLinkage.RegisterEffect.KILLS_NO_REGISTERS ? HotSpotForeignCallLinkageImpl.StackOnlyCallingConvention.StackOnlyCallee : JavaCallee)); this.jvmciRuntime = runtime; this.prependThread = prependThread; MetaAccessProvider metaAccess = providers.getMetaAccess(); @@ -127,7 +121,7 @@ public AbstractForeignCallStub(OptionValues options, providers.getForeignCalls(), targetSig, address, - DESTROYS_ALL_CALLER_SAVE_REGISTERS, + HotSpotForeignCallLinkage.RegisterEffect.DESTROYS_ALL_CALLER_SAVE_REGISTERS, NativeCall, NativeCall); } @@ -239,7 +233,7 @@ protected final StructuredGraph getGraph(DebugContext debug, CompilationIdentifi boolean shouldClearException = shouldClearException(); try { HotSpotLoweringProvider lowerer = (HotSpotLoweringProvider) providers.getLowerer(); - Templates foreignCallSnippets = lowerer.getForeignCallSnippets(); + ForeignCallSnippets.Templates foreignCallSnippets = lowerer.getForeignCallSnippets(); ResolvedJavaMethod handlePendingException = foreignCallSnippets.handlePendingException.getMethod(); ResolvedJavaMethod getAndClearObjectResult = foreignCallSnippets.getAndClearObjectResult.getMethod(); ResolvedJavaMethod verifyObject = foreignCallSnippets.verifyObject.getMethod(); @@ -249,7 +243,7 @@ protected final StructuredGraph getGraph(DebugContext debug, CompilationIdentifi graph.getGraphState().forceDisableFrameStateVerification(); ReadRegisterNode thread = kit.append(new ReadRegisterNode(providers.getRegisters().getThreadRegister(), wordTypes.getWordKind(), true, false)); ValueNode result = createTargetCall(kit, thread); - if (linkage.getDescriptor().getTransition() == Transition.SAFEPOINT) { + if (linkage.getDescriptor().getTransition() == HotSpotForeignCallDescriptor.Transition.SAFEPOINT) { kit.createIntrinsicInvoke(handlePendingException, thread, forBoolean(shouldClearException, graph), forBoolean(isObjectResult, graph)); } if (isObjectResult) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java index a70f77096f7b..a9f89aaf0db9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ArrayStoreExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java index 1e1796dbd456..182f8baed040 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ClassCastExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java similarity index 71% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java index b5ad9fa0eab9..e98a5207c442 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/CreateExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java @@ -22,34 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.NativeCall; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.clearPendingException; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; import static org.graalvm.word.LocationIdentity.any; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.DeoptimizeWithExceptionInCallerNode; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.WordFactory; import jdk.vm.ci.code.Register; @@ -93,40 +89,43 @@ protected static Object createException(Register threadRegister, Class exception, Word message) { - Word thread = registerAsWord(threadRegister); + Word thread = HotSpotReplacementsUtil.registerAsWord(threadRegister); int deoptimized = throwAndPostJvmtiException(THROW_AND_POST_JVMTI_EXCEPTION, thread, classAsCString(exception), message); return handleExceptionReturn(thread, deoptimized); } protected static Object createException(Register threadRegister, Class exception, KlassPointer klass) { - Word thread = registerAsWord(threadRegister); + Word thread = HotSpotReplacementsUtil.registerAsWord(threadRegister); int deoptimized = throwKlassExternalNameException(THROW_KLASS_EXTERNAL_NAME_EXCEPTION, thread, classAsCString(exception), klass); return handleExceptionReturn(thread, deoptimized); } protected static Object createException(Register threadRegister, Class exception, KlassPointer objKlass, KlassPointer targetKlass) { - Word thread = registerAsWord(threadRegister); + Word thread = HotSpotReplacementsUtil.registerAsWord(threadRegister); int deoptimized = throwClassCastException(THROW_CLASS_CAST_EXCEPTION, thread, classAsCString(exception), objKlass, targetKlass); return handleExceptionReturn(thread, deoptimized); } private static Object handleExceptionReturn(Word thread, int deoptimized) { - Object clearPendingException = clearPendingException(thread); + Object clearPendingException = HotSpotReplacementsUtil.clearPendingException(thread); // alwayDeoptimize is a testing option to force a deopt here but the code pattern should // keep both the deopt and return paths, so include a test against the exception which we // know should always succeed. - if ((alwayDeoptimize(INJECTED_OPTIONVALUES) && clearPendingException != null) || + if ((alwayDeoptimize(GraalHotSpotVMConfig.INJECTED_OPTIONVALUES) && clearPendingException != null) || (reportsDeoptimization(GraalHotSpotVMConfig.INJECTED_VMCONFIG) && deoptimized != 0)) { DeoptimizeWithExceptionInCallerNode.deopt(clearPendingException); } return clearPendingException; } - private static final HotSpotForeignCallDescriptor THROW_AND_POST_JVMTI_EXCEPTION = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "throw_and_post_jvmti_exception", int.class, + private static final HotSpotForeignCallDescriptor THROW_AND_POST_JVMTI_EXCEPTION = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, any(), "throw_and_post_jvmti_exception", int.class, Word.class, Word.class, Word.class); - private static final HotSpotForeignCallDescriptor THROW_KLASS_EXTERNAL_NAME_EXCEPTION = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "throw_klass_external_name_exception", + private static final HotSpotForeignCallDescriptor THROW_KLASS_EXTERNAL_NAME_EXCEPTION = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, any(), "throw_klass_external_name_exception", int.class, Word.class, Word.class, KlassPointer.class); - private static final HotSpotForeignCallDescriptor THROW_CLASS_CAST_EXCEPTION = new HotSpotForeignCallDescriptor(SAFEPOINT, REEXECUTABLE, any(), "throw_class_cast_exception", int.class, Word.class, + private static final HotSpotForeignCallDescriptor THROW_CLASS_CAST_EXCEPTION = new HotSpotForeignCallDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, any(), "throw_class_cast_exception", int.class, Word.class, Word.class, KlassPointer.class, KlassPointer.class); @NodeIntrinsic(StubForeignCallNode.class) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java index ad99367b358b..6bf33b3f9822 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/DivisionByZeroExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java similarity index 61% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java index 51b9ef566257..755a15ab4437 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ExceptionHandlerStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java @@ -22,42 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; - -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.nodes.JumpToExceptionHandlerNode.jumpToExceptionHandler; -import static org.graalvm.compiler.hotspot.nodes.PatchReturnAddressNode.patchReturnAddress; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readExceptionOop; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.readExceptionPc; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionOop; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.writeExceptionPc; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.cAssertionsEnabled; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.decipher; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.fatal; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.newDescriptor; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.printf; +package jdk.compiler.graal.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 org.graalvm.word.LocationIdentity.any; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotBackend; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.HotSpotMarkId; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.WordFactory; import jdk.vm.ci.code.Register; @@ -87,11 +80,11 @@ protected Object getConstantParameterValue(int index, String name) { @Snippet private static void exceptionHandler(Object exception, Word exceptionPc, @ConstantParameter Register threadRegister, @ConstantParameter boolean logging) { - Word thread = registerAsWord(threadRegister); - checkNoExceptionInThread(thread, assertionsEnabled(INJECTED_VMCONFIG)); - checkExceptionNotNull(assertionsEnabled(INJECTED_VMCONFIG), exception); - writeExceptionOop(thread, exception); - writeExceptionPc(thread, exceptionPc); + Word thread = HotSpotReplacementsUtil.registerAsWord(threadRegister); + checkNoExceptionInThread(thread, assertionsEnabled(GraalHotSpotVMConfig.INJECTED_VMCONFIG)); + checkExceptionNotNull(assertionsEnabled(GraalHotSpotVMConfig.INJECTED_VMCONFIG), exception); + HotSpotReplacementsUtil.writeExceptionOop(thread, exception); + HotSpotReplacementsUtil.writeExceptionPc(thread, exceptionPc); if (logging) { printf("handling exception %p (", Word.objectToTrackedPointer(exception).rawValue()); decipher(Word.objectToTrackedPointer(exception).rawValue()); @@ -101,7 +94,7 @@ private static void exceptionHandler(Object exception, Word exceptionPc, @Consta } // patch throwing pc into return address so that deoptimization finds the right debug info - patchReturnAddress(exceptionPc); + PatchReturnAddressNode.patchReturnAddress(exceptionPc); Word handlerPc = exceptionHandlerForPc(EXCEPTION_HANDLER_FOR_PC, thread); @@ -112,19 +105,19 @@ private static void exceptionHandler(Object exception, Word exceptionPc, @Consta } // patch the return address so that this stub returns to the exception handler - jumpToExceptionHandler(handlerPc); + JumpToExceptionHandlerNode.jumpToExceptionHandler(handlerPc); } static void checkNoExceptionInThread(Word thread, boolean enabled) { if (enabled) { - Object currentException = readExceptionOop(thread); + Object currentException = HotSpotReplacementsUtil.readExceptionOop(thread); if (currentException != null) { fatal("exception object in thread must be null, not %p", Word.objectToTrackedPointer(currentException).rawValue()); } - if (cAssertionsEnabled(INJECTED_VMCONFIG)) { + if (cAssertionsEnabled(GraalHotSpotVMConfig.INJECTED_VMCONFIG)) { // This thread-local is only cleared in DEBUG builds of the VM // (see OptoRuntime::generate_exception_blob) - Word currentExceptionPc = readExceptionPc(thread); + Word currentExceptionPc = HotSpotReplacementsUtil.readExceptionPc(thread); if (currentExceptionPc.notEqual(WordFactory.zero())) { fatal("exception PC in thread must be zero, not %p", currentExceptionPc.rawValue()); } @@ -148,7 +141,8 @@ static boolean assertionsEnabled(@InjectedParameter GraalHotSpotVMConfig config) return Assertions.assertionsEnabled() || cAssertionsEnabled(config); } - public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_FOR_PC = newDescriptor(SAFEPOINT, REEXECUTABLE, any(), ExceptionHandlerStub.class, "exceptionHandlerForPc", Word.class, + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_FOR_PC = newDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, any(), ExceptionHandlerStub.class, "exceptionHandlerForPc", Word.class, Word.class); @NodeIntrinsic(value = StubForeignCallNode.class) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java similarity index 66% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java index f0dedda366ff..e1ef19637b38 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallSnippets.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java @@ -22,32 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; import static jdk.vm.ci.meta.DeoptimizationReason.RuntimeConstraint; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.clearPendingException; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.getPendingException; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.loadHubIntrinsic; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.fatal; - -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.DeoptimizeCallerNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.hotspot.word.KlassPointer; -import org.graalvm.compiler.nodes.NamedLocationIdentity; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.SnippetAnchorNode; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates; -import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo; -import org.graalvm.compiler.replacements.Snippets; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; import org.graalvm.word.WordFactory; @@ -77,7 +73,7 @@ public Templates(OptionValues options, HotSpotProviders providers) { */ @Snippet(allowMissingProbabilities = true) public static void handlePendingException(Word thread, boolean shouldClearException, boolean isObjectResult) { - if ((shouldClearException && clearPendingException(thread) != null) || (!shouldClearException && getPendingException(thread) != null)) { + if ((shouldClearException && HotSpotReplacementsUtil.clearPendingException(thread) != null) || (!shouldClearException && HotSpotReplacementsUtil.getPendingException(thread) != null)) { if (isObjectResult) { getAndClearObjectResult(thread); } @@ -90,19 +86,20 @@ public static void handlePendingException(Word thread, boolean shouldClearExcept */ @Snippet(allowMissingProbabilities = true) public static Object verifyObject(Object object) { - if (HotSpotReplacementsUtil.verifyOops(INJECTED_VMCONFIG)) { - Word verifyOopCounter = WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopCounterAddress(INJECTED_VMCONFIG)); + if (HotSpotReplacementsUtil.verifyOops(GraalHotSpotVMConfig.INJECTED_VMCONFIG)) { + Word verifyOopCounter = WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopCounterAddress(GraalHotSpotVMConfig.INJECTED_VMCONFIG)); verifyOopCounter.writeInt(0, verifyOopCounter.readInt(0) + 1); Pointer oop = Word.objectToTrackedPointer(object); if (object != null) { GuardingNode anchorNode = SnippetAnchorNode.anchor(); // make sure object is 'reasonable' - if (!oop.and(WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopMask(INJECTED_VMCONFIG))).equal(WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopBits(INJECTED_VMCONFIG)))) { + if (!oop.and(WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopMask(GraalHotSpotVMConfig.INJECTED_VMCONFIG))).equal( + WordFactory.unsigned(HotSpotReplacementsUtil.verifyOopBits(GraalHotSpotVMConfig.INJECTED_VMCONFIG)))) { fatal("oop not in heap: %p", oop.rawValue()); } - KlassPointer klass = loadHubIntrinsic(PiNode.piCastNonNull(object, anchorNode)); + KlassPointer klass = HotSpotReplacementsUtil.loadHubIntrinsic(PiNode.piCastNonNull(object, anchorNode)); if (klass.isNull()) { fatal("klass for oop %p is null", oop.rawValue()); } @@ -128,8 +125,8 @@ static long verifyOopBits(@InjectedParameter GraalHotSpotVMConfig config) { */ @Snippet public static Object getAndClearObjectResult(Word thread) { - Object result = thread.readObject(objectResultOffset(INJECTED_VMCONFIG), OBJECT_RESULT_LOCATION); - thread.writeObject(objectResultOffset(INJECTED_VMCONFIG), null, OBJECT_RESULT_LOCATION); + Object result = thread.readObject(objectResultOffset(GraalHotSpotVMConfig.INJECTED_VMCONFIG), OBJECT_RESULT_LOCATION); + thread.writeObject(objectResultOffset(GraalHotSpotVMConfig.INJECTED_VMCONFIG), null, OBJECT_RESULT_LOCATION); return result; } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java index 5457cc3f48b9..1de94e45583c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/ForeignCallStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java @@ -22,33 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.GraphKit; -import org.graalvm.compiler.replacements.nodes.ReadRegisterNode; -import org.graalvm.compiler.word.Word; +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.vm.ci.hotspot.HotSpotJVMCIRuntime; import jdk.vm.ci.meta.JavaKind; /** - * A {@linkplain #getGraph generated} stub for a {@link Transition non-leaf} foreign call from - * compiled code. A stub is required for such calls as the caller may be scheduled for - * deoptimization while the call is in progress. And since these are foreign/runtime calls on slow - * paths, we don't want to force the register allocator to spill around the call. As such, this stub - * saves and restores all allocatable registers. It also + * A {@linkplain #getGraph generated} stub for a {@link HotSpotForeignCallDescriptor.Transition + * non-leaf} foreign call from compiled code. A stub is required for such calls as the caller may be + * scheduled for deoptimization while the call is in progress. And since these are foreign/runtime + * calls on slow paths, we don't want to force the register allocator to spill around the call. As + * such, this stub saves and restores all allocatable registers. It also * {@linkplain ForeignCallSnippets#handlePendingException handles} any exceptions raised during the * foreign call. */ diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/HotSpotGraphKit.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/HotSpotGraphKit.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java index 1c6d3469bbb3..678d01eda83f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/HotSpotGraphKit.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE; -import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; +import static jdk.compiler.graal.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.hotspot.HotSpotGraphBuilderInstance; -import org.graalvm.compiler.java.GraphBuilderPhase; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase; -import org.graalvm.compiler.phases.common.inlining.InliningUtil; -import org.graalvm.compiler.phases.util.Providers; -import org.graalvm.compiler.replacements.GraphKit; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java index 614d7ffac257..c13bc7a661b5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IntegerExactOverflowExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IntegerExactOverflowExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java index b44ec0fa3dfa..e15cf648fea1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IntegerExactOverflowExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IntrinsicStubs.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java similarity index 56% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IntrinsicStubs.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java index 428b2cf30c22..af162c1ebe63 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/IntrinsicStubs.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java @@ -22,35 +22,35 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.lir.GeneratedStubsHolder; -import org.graalvm.compiler.replacements.StringLatin1InflateNode; -import org.graalvm.compiler.replacements.StringUTF16CompressNode; -import org.graalvm.compiler.replacements.nodes.AESNode; -import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode; -import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode; -import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode; -import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode; -import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToNode; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode; -import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsWithMaskNode; -import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode; -import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode; -import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode; -import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode; -import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode; -import org.graalvm.compiler.replacements.nodes.CountPositivesNode; -import org.graalvm.compiler.replacements.nodes.CounterModeAESNode; -import org.graalvm.compiler.replacements.nodes.EncodeArrayNode; -import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.MD5Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA3Node; -import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node; -import org.graalvm.compiler.replacements.nodes.VectorizedHashCodeNode; -import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode; +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; @GeneratedStubsHolder(targetVM = "hotspot", sources = { ArrayIndexOfNode.class, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/InvokeJavaMethodStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/InvokeJavaMethodStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java index 37f35fcf1d80..7fe3d048a80a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/InvokeJavaMethodStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java @@ -22,31 +22,31 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.core.common.type.PrimitiveStamp.getBits; -import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.INVOKE_STATIC_METHOD_ONE_ARG; +import static jdk.compiler.graal.core.common.type.PrimitiveStamp.getBits; -import org.graalvm.compiler.core.common.type.FloatStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.PrimitiveStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.ReinterpretNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.GraphKit; -import org.graalvm.compiler.replacements.nodes.ReadRegisterNode; -import org.graalvm.compiler.word.WordCastNode; +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.vm.ci.code.site.ConstantReference; import jdk.vm.ci.code.site.DataPatch; @@ -84,7 +84,7 @@ public InvokeJavaMethodStub(OptionValues options, @Override protected HotSpotForeignCallDescriptor getTargetSignature(HotSpotForeignCallDescriptor descriptor) { - return INVOKE_STATIC_METHOD_ONE_ARG; + return HotSpotHostForeignCallsProvider.INVOKE_STATIC_METHOD_ONE_ARG; } @Override @@ -126,9 +126,9 @@ protected ValueNode createTargetCall(GraphKit kit, ReadRegisterNode thread) { } targetArguments[2] = value; } - assert INVOKE_STATIC_METHOD_ONE_ARG.getResultType() == long.class; + assert HotSpotHostForeignCallsProvider.INVOKE_STATIC_METHOD_ONE_ARG.getResultType() == long.class; Stamp returnStamp = StampFactory.forKind(JavaKind.Long); - ValueNode result = kit.append(new StubForeignCallNode(providers.getForeignCalls(), returnStamp, INVOKE_STATIC_METHOD_ONE_ARG, targetArguments)); + ValueNode result = kit.append(new StubForeignCallNode(providers.getForeignCalls(), returnStamp, HotSpotHostForeignCallsProvider.INVOKE_STATIC_METHOD_ONE_ARG, targetArguments)); return result; } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/LongExactOverflowExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/LongExactOverflowExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java index 790a0a2d16df..c9fd365314b2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/LongExactOverflowExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.replacements.nodes.CStringConstant; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java index 5ea2fe20cb19..a1a5c655f52c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/NegativeArraySizeExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.printNumber; +import static jdk.compiler.graal.hotspot.stubs.StubUtil.printNumber; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.AllocaNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java index 044627e5fc1e..36c10cddff4c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/NullPointerExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java index 0f83b86299f0..c243000bbbf4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/OutOfBoundsExceptionStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java @@ -22,20 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.printNumber; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.printString; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.AllocaNode; -import org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.word.Word; +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.vm.ci.code.Register; @@ -74,12 +71,12 @@ private static Object createOutOfBoundsException(int idx, int length, @ConstantP Word buffer = AllocaNode.alloca(bufferSizeInBytes, HotSpotReplacementsUtil.wordSize()); Word ptr; if (printLengthInException) { - ptr = printString(buffer, STR_INDEX); - ptr = printNumber(ptr, idx); - ptr = printString(ptr, STR_OUTOFBOUNDSFORLENGTH); - ptr = printNumber(ptr, length); + ptr = StubUtil.printString(buffer, STR_INDEX); + ptr = StubUtil.printNumber(ptr, idx); + ptr = StubUtil.printString(ptr, STR_OUTOFBOUNDSFORLENGTH); + ptr = StubUtil.printNumber(ptr, length); } else { - ptr = printNumber(buffer, idx); + ptr = StubUtil.printNumber(buffer, idx); } ptr.writeByte(0, (byte) 0); return createException(threadRegister, ArrayIndexOutOfBoundsException.class, buffer); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java index b671e3084e90..1b0d9facbcdb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/SnippetStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; import java.util.BitSet; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.nodes.GraphState.GuardsStage; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.spi.SnippetParameterInfo; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.common.CanonicalizerPhase; -import org.graalvm.compiler.phases.common.HighTierLoweringPhase; -import org.graalvm.compiler.replacements.SnippetTemplate; -import org.graalvm.compiler.replacements.Snippets; +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.vm.ci.meta.ResolvedJavaMethod; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/Stub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/Stub.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/Stub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/Stub.java index b6dc2781670f..0efa7920f34c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/Stub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/Stub.java @@ -22,48 +22,48 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.core.GraalCompiler.emitFrontEnd; -import static org.graalvm.compiler.core.common.GraalOptions.RegisterPressure; -import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets; -import static org.graalvm.compiler.hotspot.HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP; -import static org.graalvm.util.CollectionsUtil.allMatch; +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 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 org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.code.CompilationResult; -import org.graalvm.compiler.core.CompilationPrinter; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.target.Backend; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Builder; -import org.graalvm.compiler.debug.DebugContext.Description; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.StubStartNode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory; -import org.graalvm.compiler.lir.phases.LIRPhase; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext; -import org.graalvm.compiler.lir.profiling.MoveProfilingPhase; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.GraphState.StageFlag; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.Speculative; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.printer.GraalDebugHandlersFactory; +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.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.InstalledCode; @@ -284,7 +284,7 @@ private boolean checkStubInvariants(CompilationResult compResult) { Call call = (Call) infopoint; assert call.target instanceof HotSpotForeignCallLinkage : this + " cannot have non runtime call: " + call.target; HotSpotForeignCallLinkage callLinkage = (HotSpotForeignCallLinkage) call.target; - assert !callLinkage.isCompiledStub() || callLinkage.getDescriptor().equals(DEOPT_BLOB_UNCOMMON_TRAP) : this + " cannot call compiled stub " + callLinkage; + assert !callLinkage.isCompiledStub() || callLinkage.getDescriptor().equals(HotSpotHostBackend.DEOPT_BLOB_UNCOMMON_TRAP) : this + " cannot call compiled stub " + callLinkage; } return true; } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java index ecd3c38bd374..b8026c3782a4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubCompilationIdentifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; import java.util.concurrent.atomic.AtomicLong; -import org.graalvm.compiler.core.common.CompilationIdentifier; -import org.graalvm.compiler.debug.GraalError; +import jdk.compiler.graal.core.common.CompilationIdentifier; +import jdk.compiler.graal.debug.GraalError; /** * {@link CompilationIdentifier} for {@linkplain Stub stub compilations}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java index 5678b3533780..c9d5a3c3df58 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; +import jdk.compiler.graal.options.Option; +import jdk.compiler.graal.options.OptionKey; +import jdk.compiler.graal.options.OptionType; //JaCoCo Exclude diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java index e57eb2002421..a0ec596dd024 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/StubUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java @@ -22,28 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.LEAF; -import static org.graalvm.compiler.replacements.nodes.CStringConstant.cstring; +import static jdk.compiler.graal.replacements.nodes.CStringConstant.cstring; import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.util.Arrays; import java.util.List; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.hotspot.nodes.VMErrorNode; -import org.graalvm.compiler.hotspot.replacements.Log; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.WordFactory; @@ -54,7 +52,8 @@ */ public class StubUtil { - public static final HotSpotForeignCallDescriptor VM_MESSAGE_C = newDescriptor(LEAF, REEXECUTABLE, null, StubUtil.class, "vmMessageC", void.class, boolean.class, Word.class, long.class, + public static final HotSpotForeignCallDescriptor VM_MESSAGE_C = newDescriptor(HotSpotForeignCallDescriptor.Transition.LEAF, HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, null, + StubUtil.class, "vmMessageC", void.class, boolean.class, Word.class, long.class, long.class, long.class); public static HotSpotForeignCallDescriptor newDescriptor(HotSpotForeignCallDescriptor.Transition safepoint, HotSpotForeignCallDescriptor.Reexecutability reexecutable, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java similarity index 60% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java index efbef6d89db9..12ce21f8834a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/UnwindExceptionToCallerStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java @@ -22,38 +22,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_OPTIONVALUES; -import static org.graalvm.compiler.hotspot.GraalHotSpotVMConfig.INJECTED_VMCONFIG; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE; -import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT; -import static org.graalvm.compiler.hotspot.nodes.JumpToExceptionHandlerInCallerNode.jumpToExceptionHandlerInCaller; -import static org.graalvm.compiler.hotspot.replacements.HotSpotReplacementsUtil.registerAsWord; -import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.checkExceptionNotNull; -import static org.graalvm.compiler.hotspot.stubs.ExceptionHandlerStub.checkNoExceptionInThread; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.cAssertionsEnabled; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.decipher; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.newDescriptor; -import static org.graalvm.compiler.hotspot.stubs.StubUtil.printf; +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 org.graalvm.word.LocationIdentity.any; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Fold.InjectedParameter; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter; -import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.graph.Node.ConstantNodeParameter; -import org.graalvm.compiler.graph.Node.NodeIntrinsic; -import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.hotspot.nodes.StubForeignCallNode; -import org.graalvm.compiler.nodes.UnwindNode; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.word.Word; +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 org.graalvm.word.Pointer; import jdk.vm.ci.code.Register; @@ -79,26 +75,26 @@ protected Object getConstantParameterValue(int index, String name) { @Snippet private static void unwindExceptionToCaller(Object exception, Word returnAddress, @ConstantParameter Register threadRegister) { Pointer exceptionOop = Word.objectToTrackedPointer(exception); - if (logging(INJECTED_OPTIONVALUES)) { + if (logging(GraalHotSpotVMConfig.INJECTED_OPTIONVALUES)) { printf("unwinding exception %p (", exceptionOop.rawValue()); decipher(exceptionOop.rawValue()); printf(") at %p (", returnAddress.rawValue()); decipher(returnAddress.rawValue()); printf(")\n"); } - Word thread = registerAsWord(threadRegister); - checkNoExceptionInThread(thread, assertionsEnabled(INJECTED_VMCONFIG)); - checkExceptionNotNull(assertionsEnabled(INJECTED_VMCONFIG), exception); + Word thread = HotSpotReplacementsUtil.registerAsWord(threadRegister); + checkNoExceptionInThread(thread, assertionsEnabled(GraalHotSpotVMConfig.INJECTED_VMCONFIG)); + checkExceptionNotNull(assertionsEnabled(GraalHotSpotVMConfig.INJECTED_VMCONFIG), exception); Word handlerInCallerPc = exceptionHandlerForReturnAddress(EXCEPTION_HANDLER_FOR_RETURN_ADDRESS, thread, returnAddress); - if (logging(INJECTED_OPTIONVALUES)) { + if (logging(GraalHotSpotVMConfig.INJECTED_OPTIONVALUES)) { printf("handler for exception %p at return address %p is at %p (", exceptionOop.rawValue(), returnAddress.rawValue(), handlerInCallerPc.rawValue()); decipher(handlerInCallerPc.rawValue()); printf(")\n"); } - jumpToExceptionHandlerInCaller(handlerInCallerPc, exception, returnAddress); + JumpToExceptionHandlerInCallerNode.jumpToExceptionHandlerInCaller(handlerInCallerPc, exception, returnAddress); } @Fold @@ -116,7 +112,8 @@ static boolean assertionsEnabled(@InjectedParameter GraalHotSpotVMConfig config) return Assertions.assertionsEnabled() || cAssertionsEnabled(config); } - public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_FOR_RETURN_ADDRESS = newDescriptor(SAFEPOINT, REEXECUTABLE, any(), UnwindExceptionToCallerStub.class, + public static final HotSpotForeignCallDescriptor EXCEPTION_HANDLER_FOR_RETURN_ADDRESS = newDescriptor(HotSpotForeignCallDescriptor.Transition.SAFEPOINT, + HotSpotForeignCallDescriptor.Reexecutability.REEXECUTABLE, any(), UnwindExceptionToCallerStub.class, "exceptionHandlerForReturnAddress", Word.class, Word.class, Word.class); @NodeIntrinsic(value = StubForeignCallNode.class) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java index 44d7bea10136..14a71b8c2f83 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/stubs/VerifyOopStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java @@ -22,15 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.stubs; +package jdk.compiler.graal.hotspot.stubs; -import static org.graalvm.compiler.hotspot.stubs.ForeignCallSnippets.verifyObject; - -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkage; -import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider; -import org.graalvm.compiler.hotspot.meta.HotSpotProviders; -import org.graalvm.compiler.options.OptionValues; +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; /** * Stub called via {@link HotSpotHostForeignCallsProvider#VERIFY_OOP}. @@ -43,6 +41,6 @@ public VerifyOopStub(OptionValues options, HotSpotProviders providers, HotSpotFo @Snippet private static Object verifyOop(Object object) { - return verifyObject(object); + return ForeignCallSnippets.verifyObject(object); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java index ce5ed6ad002b..7c684e1e178d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/HotSpotOperation.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java index 229c89aefec2..b4060576d489 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/HotSpotWordTypes.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.hotspot.nodes.type.KlassPointerStamp; -import org.graalvm.compiler.hotspot.nodes.type.MethodCountersPointerStamp; -import org.graalvm.compiler.hotspot.nodes.type.MethodPointerStamp; -import org.graalvm.compiler.word.WordTypes; +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.vm.ci.meta.JavaKind; import jdk.vm.ci.meta.JavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/KlassPointer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/KlassPointer.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/KlassPointer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/KlassPointer.java index 4380fa954034..84fa7930d1b2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/KlassPointer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/KlassPointer.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.READ_KLASS_POINTER; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.TO_KLASS_POINTER; +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 org.graalvm.compiler.word.Word.Opcode; -import org.graalvm.compiler.word.Word.Operation; +import jdk.compiler.graal.word.Word.Opcode; +import jdk.compiler.graal.word.Word.Operation; import org.graalvm.word.LocationIdentity; import org.graalvm.word.Pointer; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java index c62be005f0ff..690d3f2bb9ce 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MetaspacePointer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.FROM_POINTER; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.IS_NULL; +import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.FROM_POINTER; +import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.IS_NULL; -import org.graalvm.compiler.core.common.memory.BarrierType; -import org.graalvm.compiler.word.Word; -import org.graalvm.compiler.word.Word.Opcode; -import org.graalvm.compiler.word.Word.Operation; +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 org.graalvm.word.LocationIdentity; import org.graalvm.word.SignedWord; import org.graalvm.word.UnsignedWord; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java index 6f5873dea89f..5e598c056282 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MethodCountersPointer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; +import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; +import static jdk.compiler.graal.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; /** * Marker type for a metaspace pointer to a method counters. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MethodPointer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodPointer.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MethodPointer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodPointer.java index e13069a25dd5..175990fafc3d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/MethodPointer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodPointer.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_EQ; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.POINTER_NE; -import static org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode.TO_METHOD_POINTER; +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 org.graalvm.word.Pointer; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java index 03ddc4909246..7d1c055d12da 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/hotspot/word/PointerCastNode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.hotspot.word; +package jdk.compiler.graal.hotspot.word; -import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0; -import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0; +import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0; +import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeClass; -import org.graalvm.compiler.nodes.spi.Canonicalizable; -import org.graalvm.compiler.nodes.spi.CanonicalizerTool; -import org.graalvm.compiler.hotspot.word.HotSpotOperation.HotspotOpcode; -import org.graalvm.compiler.nodeinfo.NodeInfo; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.spi.LIRLowerable; -import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BciBlockMapping.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BciBlockMapping.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BciBlockMapping.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BciBlockMapping.java index b86f2eb9595f..f9d9591560d3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BciBlockMapping.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BciBlockMapping.java @@ -22,213 +22,213 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; - -import static org.graalvm.compiler.bytecode.Bytecodes.AALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.AASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ACONST_NULL; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ANEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.ARETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.ARRAYLENGTH; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ATHROW; -import static org.graalvm.compiler.bytecode.Bytecodes.BALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.BASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.BIPUSH; -import static org.graalvm.compiler.bytecode.Bytecodes.BREAKPOINT; -import static org.graalvm.compiler.bytecode.Bytecodes.CALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.CASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.CHECKCAST; -import static org.graalvm.compiler.bytecode.Bytecodes.D2F; -import static org.graalvm.compiler.bytecode.Bytecodes.D2I; -import static org.graalvm.compiler.bytecode.Bytecodes.D2L; -import static org.graalvm.compiler.bytecode.Bytecodes.DADD; -import static org.graalvm.compiler.bytecode.Bytecodes.DALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.DASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.DCMPG; -import static org.graalvm.compiler.bytecode.Bytecodes.DCMPL; -import static org.graalvm.compiler.bytecode.Bytecodes.DCONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DCONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.DMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.DNEG; -import static org.graalvm.compiler.bytecode.Bytecodes.DREM; -import static org.graalvm.compiler.bytecode.Bytecodes.DRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.DSUB; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2_X1; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2_X2; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP_X1; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP_X2; -import static org.graalvm.compiler.bytecode.Bytecodes.F2D; -import static org.graalvm.compiler.bytecode.Bytecodes.F2I; -import static org.graalvm.compiler.bytecode.Bytecodes.F2L; -import static org.graalvm.compiler.bytecode.Bytecodes.FADD; -import static org.graalvm.compiler.bytecode.Bytecodes.FALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.FASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.FCMPG; -import static org.graalvm.compiler.bytecode.Bytecodes.FCMPL; -import static org.graalvm.compiler.bytecode.Bytecodes.FCONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FCONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FCONST_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.FMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.FNEG; -import static org.graalvm.compiler.bytecode.Bytecodes.FREM; -import static org.graalvm.compiler.bytecode.Bytecodes.FRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.FSUB; -import static org.graalvm.compiler.bytecode.Bytecodes.GETFIELD; -import static org.graalvm.compiler.bytecode.Bytecodes.GETSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.GOTO; -import static org.graalvm.compiler.bytecode.Bytecodes.GOTO_W; -import static org.graalvm.compiler.bytecode.Bytecodes.I2B; -import static org.graalvm.compiler.bytecode.Bytecodes.I2C; -import static org.graalvm.compiler.bytecode.Bytecodes.I2D; -import static org.graalvm.compiler.bytecode.Bytecodes.I2F; -import static org.graalvm.compiler.bytecode.Bytecodes.I2L; -import static org.graalvm.compiler.bytecode.Bytecodes.I2S; -import static org.graalvm.compiler.bytecode.Bytecodes.IADD; -import static org.graalvm.compiler.bytecode.Bytecodes.IALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.IAND; -import static org.graalvm.compiler.bytecode.Bytecodes.IASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_4; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_5; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_M1; -import static org.graalvm.compiler.bytecode.Bytecodes.IDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.IFEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IFGE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFGT; -import static org.graalvm.compiler.bytecode.Bytecodes.IFLE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFLT; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNONNULL; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNULL; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ACMPEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ACMPNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPGE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPGT; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPLE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPLT; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IINC; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.IMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.INEG; -import static org.graalvm.compiler.bytecode.Bytecodes.INSTANCEOF; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEINTERFACE; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESPECIAL; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; -import static org.graalvm.compiler.bytecode.Bytecodes.IOR; -import static org.graalvm.compiler.bytecode.Bytecodes.IREM; -import static org.graalvm.compiler.bytecode.Bytecodes.IRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.ISHL; -import static org.graalvm.compiler.bytecode.Bytecodes.ISHR; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ISUB; -import static org.graalvm.compiler.bytecode.Bytecodes.IUSHR; -import static org.graalvm.compiler.bytecode.Bytecodes.IXOR; -import static org.graalvm.compiler.bytecode.Bytecodes.JSR; -import static org.graalvm.compiler.bytecode.Bytecodes.JSR_W; -import static org.graalvm.compiler.bytecode.Bytecodes.L2D; -import static org.graalvm.compiler.bytecode.Bytecodes.L2F; -import static org.graalvm.compiler.bytecode.Bytecodes.L2I; -import static org.graalvm.compiler.bytecode.Bytecodes.LADD; -import static org.graalvm.compiler.bytecode.Bytecodes.LALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.LAND; -import static org.graalvm.compiler.bytecode.Bytecodes.LASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.LCMP; -import static org.graalvm.compiler.bytecode.Bytecodes.LCONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LCONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC2_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.LMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.LNEG; -import static org.graalvm.compiler.bytecode.Bytecodes.LOOKUPSWITCH; -import static org.graalvm.compiler.bytecode.Bytecodes.LOR; -import static org.graalvm.compiler.bytecode.Bytecodes.LREM; -import static org.graalvm.compiler.bytecode.Bytecodes.LRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.LSHL; -import static org.graalvm.compiler.bytecode.Bytecodes.LSHR; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.LSUB; -import static org.graalvm.compiler.bytecode.Bytecodes.LUSHR; -import static org.graalvm.compiler.bytecode.Bytecodes.LXOR; -import static org.graalvm.compiler.bytecode.Bytecodes.MONITORENTER; -import static org.graalvm.compiler.bytecode.Bytecodes.MONITOREXIT; -import static org.graalvm.compiler.bytecode.Bytecodes.MULTIANEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.NEW; -import static org.graalvm.compiler.bytecode.Bytecodes.NEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.NOP; -import static org.graalvm.compiler.bytecode.Bytecodes.POP; -import static org.graalvm.compiler.bytecode.Bytecodes.POP2; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTFIELD; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.RET; -import static org.graalvm.compiler.bytecode.Bytecodes.RETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.SALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.SASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.SIPUSH; -import static org.graalvm.compiler.bytecode.Bytecodes.SWAP; -import static org.graalvm.compiler.bytecode.Bytecodes.TABLESWITCH; -import static org.graalvm.compiler.bytecode.Bytecodes.WIDE; -import static org.graalvm.compiler.core.common.GraalOptions.SupportJsrBytecodes; -import static org.graalvm.compiler.java.BciBlockMapping.Options.MaxDuplicationFactor; +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; 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 org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.BytecodeLookupSwitch; -import org.graalvm.compiler.bytecode.BytecodeStream; -import org.graalvm.compiler.bytecode.BytecodeSwitch; -import org.graalvm.compiler.bytecode.BytecodeTableSwitch; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.Scope; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.JavaMethodContext; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.ExceptionHandler; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BytecodeParser.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParser.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BytecodeParser.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParser.java index 12ffabdc36ac..f8108e62cedd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BytecodeParser.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParser.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.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 org.graalvm.compiler.bytecode.Bytecodes.AALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.AASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ACONST_NULL; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ANEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.ARETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.ARRAYLENGTH; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ATHROW; -import static org.graalvm.compiler.bytecode.Bytecodes.BALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.BASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.BIPUSH; -import static org.graalvm.compiler.bytecode.Bytecodes.BREAKPOINT; -import static org.graalvm.compiler.bytecode.Bytecodes.CALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.CASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.CHECKCAST; -import static org.graalvm.compiler.bytecode.Bytecodes.D2F; -import static org.graalvm.compiler.bytecode.Bytecodes.D2I; -import static org.graalvm.compiler.bytecode.Bytecodes.D2L; -import static org.graalvm.compiler.bytecode.Bytecodes.DADD; -import static org.graalvm.compiler.bytecode.Bytecodes.DALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.DASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.DCMPG; -import static org.graalvm.compiler.bytecode.Bytecodes.DCMPL; -import static org.graalvm.compiler.bytecode.Bytecodes.DCONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DCONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.DMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.DNEG; -import static org.graalvm.compiler.bytecode.Bytecodes.DREM; -import static org.graalvm.compiler.bytecode.Bytecodes.DRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.DSUB; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2_X1; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2_X2; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP_X1; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP_X2; -import static org.graalvm.compiler.bytecode.Bytecodes.F2D; -import static org.graalvm.compiler.bytecode.Bytecodes.F2I; -import static org.graalvm.compiler.bytecode.Bytecodes.F2L; -import static org.graalvm.compiler.bytecode.Bytecodes.FADD; -import static org.graalvm.compiler.bytecode.Bytecodes.FALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.FASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.FCMPG; -import static org.graalvm.compiler.bytecode.Bytecodes.FCMPL; -import static org.graalvm.compiler.bytecode.Bytecodes.FCONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FCONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FCONST_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.FMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.FNEG; -import static org.graalvm.compiler.bytecode.Bytecodes.FREM; -import static org.graalvm.compiler.bytecode.Bytecodes.FRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.FSUB; -import static org.graalvm.compiler.bytecode.Bytecodes.GETFIELD; -import static org.graalvm.compiler.bytecode.Bytecodes.GETSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.GOTO; -import static org.graalvm.compiler.bytecode.Bytecodes.GOTO_W; -import static org.graalvm.compiler.bytecode.Bytecodes.I2B; -import static org.graalvm.compiler.bytecode.Bytecodes.I2C; -import static org.graalvm.compiler.bytecode.Bytecodes.I2D; -import static org.graalvm.compiler.bytecode.Bytecodes.I2F; -import static org.graalvm.compiler.bytecode.Bytecodes.I2L; -import static org.graalvm.compiler.bytecode.Bytecodes.I2S; -import static org.graalvm.compiler.bytecode.Bytecodes.IADD; -import static org.graalvm.compiler.bytecode.Bytecodes.IALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.IAND; -import static org.graalvm.compiler.bytecode.Bytecodes.IASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_4; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_5; -import static org.graalvm.compiler.bytecode.Bytecodes.ICONST_M1; -import static org.graalvm.compiler.bytecode.Bytecodes.IDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.IFEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IFGE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFGT; -import static org.graalvm.compiler.bytecode.Bytecodes.IFLE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFLT; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNONNULL; -import static org.graalvm.compiler.bytecode.Bytecodes.IFNULL; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ACMPEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ACMPNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPEQ; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPGE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPGT; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPLE; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPLT; -import static org.graalvm.compiler.bytecode.Bytecodes.IF_ICMPNE; -import static org.graalvm.compiler.bytecode.Bytecodes.IINC; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.IMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.INEG; -import static org.graalvm.compiler.bytecode.Bytecodes.INSTANCEOF; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEDYNAMIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEINTERFACE; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESPECIAL; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKESTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.INVOKEVIRTUAL; -import static org.graalvm.compiler.bytecode.Bytecodes.IOR; -import static org.graalvm.compiler.bytecode.Bytecodes.IREM; -import static org.graalvm.compiler.bytecode.Bytecodes.IRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.ISHL; -import static org.graalvm.compiler.bytecode.Bytecodes.ISHR; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ISUB; -import static org.graalvm.compiler.bytecode.Bytecodes.IUSHR; -import static org.graalvm.compiler.bytecode.Bytecodes.IXOR; -import static org.graalvm.compiler.bytecode.Bytecodes.JSR; -import static org.graalvm.compiler.bytecode.Bytecodes.JSR_W; -import static org.graalvm.compiler.bytecode.Bytecodes.L2D; -import static org.graalvm.compiler.bytecode.Bytecodes.L2F; -import static org.graalvm.compiler.bytecode.Bytecodes.L2I; -import static org.graalvm.compiler.bytecode.Bytecodes.LADD; -import static org.graalvm.compiler.bytecode.Bytecodes.LALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.LAND; -import static org.graalvm.compiler.bytecode.Bytecodes.LASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.LCMP; -import static org.graalvm.compiler.bytecode.Bytecodes.LCONST_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LCONST_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC2_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LDC_W; -import static org.graalvm.compiler.bytecode.Bytecodes.LDIV; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.LMUL; -import static org.graalvm.compiler.bytecode.Bytecodes.LNEG; -import static org.graalvm.compiler.bytecode.Bytecodes.LOOKUPSWITCH; -import static org.graalvm.compiler.bytecode.Bytecodes.LOR; -import static org.graalvm.compiler.bytecode.Bytecodes.LREM; -import static org.graalvm.compiler.bytecode.Bytecodes.LRETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.LSHL; -import static org.graalvm.compiler.bytecode.Bytecodes.LSHR; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.LSUB; -import static org.graalvm.compiler.bytecode.Bytecodes.LUSHR; -import static org.graalvm.compiler.bytecode.Bytecodes.LXOR; -import static org.graalvm.compiler.bytecode.Bytecodes.MONITORENTER; -import static org.graalvm.compiler.bytecode.Bytecodes.MONITOREXIT; -import static org.graalvm.compiler.bytecode.Bytecodes.MULTIANEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.NEW; -import static org.graalvm.compiler.bytecode.Bytecodes.NEWARRAY; -import static org.graalvm.compiler.bytecode.Bytecodes.NOP; -import static org.graalvm.compiler.bytecode.Bytecodes.POP; -import static org.graalvm.compiler.bytecode.Bytecodes.POP2; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTFIELD; -import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC; -import static org.graalvm.compiler.bytecode.Bytecodes.RET; -import static org.graalvm.compiler.bytecode.Bytecodes.RETURN; -import static org.graalvm.compiler.bytecode.Bytecodes.SALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.SASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.SIPUSH; -import static org.graalvm.compiler.bytecode.Bytecodes.SWAP; -import static org.graalvm.compiler.bytecode.Bytecodes.TABLESWITCH; -import static org.graalvm.compiler.bytecode.Bytecodes.nameOf; -import static org.graalvm.compiler.core.common.GraalOptions.DeoptALot; -import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining; -import static org.graalvm.compiler.core.common.GraalOptions.PrintProfilingInformation; -import static org.graalvm.compiler.core.common.GraalOptions.StressExplicitExceptionCode; -import static org.graalvm.compiler.core.common.GraalOptions.StressInvokeWithExceptionNode; -import static org.graalvm.compiler.core.common.GraalOptions.StrictDeoptInsertionChecks; -import static org.graalvm.compiler.core.common.GraalOptions.TraceInlining; -import static org.graalvm.compiler.core.common.type.StampFactory.objectNonNull; -import static org.graalvm.compiler.debug.GraalError.guarantee; -import static org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue; -import static org.graalvm.compiler.java.BytecodeParserOptions.InlinePartialIntrinsicExitDuringParsing; -import static org.graalvm.compiler.java.BytecodeParserOptions.TraceBytecodeParserLevel; -import static org.graalvm.compiler.java.BytecodeParserOptions.TraceInlineDuringParsing; -import static org.graalvm.compiler.java.BytecodeParserOptions.TraceParserPlugins; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY; -import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_DURING_PARSING; +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 java.util.ArrayList; import java.util.BitSet; @@ -270,171 +270,171 @@ import org.graalvm.collections.EconomicMap; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.api.replacements.Fold; -import org.graalvm.compiler.api.replacements.Snippet; -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.BytecodeDisassembler; -import org.graalvm.compiler.bytecode.BytecodeLookupSwitch; -import org.graalvm.compiler.bytecode.BytecodeProvider; -import org.graalvm.compiler.bytecode.BytecodeStream; -import org.graalvm.compiler.bytecode.BytecodeSwitch; -import org.graalvm.compiler.bytecode.BytecodeTableSwitch; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.bytecode.Bytes; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecodeProvider; -import org.graalvm.compiler.core.common.GraalOptions; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.RetryableBailoutException; -import org.graalvm.compiler.core.common.calc.CanonicalCondition; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.core.common.calc.Condition.CanonicalizedCondition; -import org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.core.common.type.IntegerStamp; -import org.graalvm.compiler.core.common.type.ObjectStamp; -import org.graalvm.compiler.core.common.type.Stamp; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.core.common.type.TypeReference; -import org.graalvm.compiler.core.common.util.Util; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugCloseable; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugOptions; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.debug.MethodFilter; -import org.graalvm.compiler.debug.TTY; -import org.graalvm.compiler.graph.Graph.Mark; -import org.graalvm.compiler.graph.Node; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.graph.iterators.NodeIterable; -import org.graalvm.compiler.java.BciBlockMapping.BciBlock; -import org.graalvm.compiler.java.BciBlockMapping.ExceptionDispatchBlock; -import org.graalvm.compiler.nodes.AbstractBeginNode; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.BeginNode; -import org.graalvm.compiler.nodes.BeginStateSplitNode; -import org.graalvm.compiler.nodes.CallTargetNode; -import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.ControlSplitNode; -import org.graalvm.compiler.nodes.DeoptimizeNode; -import org.graalvm.compiler.nodes.EndNode; -import org.graalvm.compiler.nodes.EntryMarkerNode; -import org.graalvm.compiler.nodes.EntryProxyNode; -import org.graalvm.compiler.nodes.FieldLocationIdentity; -import org.graalvm.compiler.nodes.FixedGuardNode; -import org.graalvm.compiler.nodes.FixedNode; -import org.graalvm.compiler.nodes.FixedWithNextNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.FullInfopointNode; -import org.graalvm.compiler.nodes.IfNode; -import org.graalvm.compiler.nodes.InliningLog; -import org.graalvm.compiler.nodes.InliningLog.PlaceholderInvokable; -import org.graalvm.compiler.nodes.Invokable; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.InvokeNode; -import org.graalvm.compiler.nodes.InvokeWithExceptionNode; -import org.graalvm.compiler.nodes.LogicConstantNode; -import org.graalvm.compiler.nodes.LogicNegationNode; -import org.graalvm.compiler.nodes.LogicNode; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.LoopEndNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.MergeNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PiNode; -import org.graalvm.compiler.nodes.PluginReplacementNode; -import org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode; -import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData; -import org.graalvm.compiler.nodes.ProfileData.ProfileSource; -import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData; -import org.graalvm.compiler.nodes.ReturnNode; -import org.graalvm.compiler.nodes.StartNode; -import org.graalvm.compiler.nodes.StateSplit; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.UnwindNode; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.WithExceptionNode; -import org.graalvm.compiler.nodes.calc.AddNode; -import org.graalvm.compiler.nodes.calc.AndNode; -import org.graalvm.compiler.nodes.calc.CompareNode; -import org.graalvm.compiler.nodes.calc.ConditionalNode; -import org.graalvm.compiler.nodes.calc.FloatConvertNode; -import org.graalvm.compiler.nodes.calc.FloatDivNode; -import org.graalvm.compiler.nodes.calc.FloatNormalizeCompareNode; -import org.graalvm.compiler.nodes.calc.IntegerBelowNode; -import org.graalvm.compiler.nodes.calc.IntegerEqualsNode; -import org.graalvm.compiler.nodes.calc.IntegerLessThanNode; -import org.graalvm.compiler.nodes.calc.IntegerNormalizeCompareNode; -import org.graalvm.compiler.nodes.calc.IsNullNode; -import org.graalvm.compiler.nodes.calc.LeftShiftNode; -import org.graalvm.compiler.nodes.calc.MulNode; -import org.graalvm.compiler.nodes.calc.NarrowNode; -import org.graalvm.compiler.nodes.calc.NegateNode; -import org.graalvm.compiler.nodes.calc.ObjectEqualsNode; -import org.graalvm.compiler.nodes.calc.OrNode; -import org.graalvm.compiler.nodes.calc.RemNode; -import org.graalvm.compiler.nodes.calc.RightShiftNode; -import org.graalvm.compiler.nodes.calc.SignExtendNode; -import org.graalvm.compiler.nodes.calc.SignedDivNode; -import org.graalvm.compiler.nodes.calc.SignedRemNode; -import org.graalvm.compiler.nodes.calc.SubNode; -import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode; -import org.graalvm.compiler.nodes.calc.XorNode; -import org.graalvm.compiler.nodes.calc.ZeroExtendNode; -import org.graalvm.compiler.nodes.extended.AnchoringNode; -import org.graalvm.compiler.nodes.extended.BranchProbabilityNode; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode; -import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind; -import org.graalvm.compiler.nodes.extended.GuardingNode; -import org.graalvm.compiler.nodes.extended.IntegerSwitchNode; -import org.graalvm.compiler.nodes.extended.LoadArrayComponentHubNode; -import org.graalvm.compiler.nodes.extended.LoadHubNode; -import org.graalvm.compiler.nodes.extended.MembarNode; -import org.graalvm.compiler.nodes.extended.StateSplitProxyNode; -import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPluginContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver; -import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin; -import org.graalvm.compiler.nodes.java.ArrayLengthNode; -import org.graalvm.compiler.nodes.java.ExceptionObjectNode; -import org.graalvm.compiler.nodes.java.FinalFieldBarrierNode; -import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode; -import org.graalvm.compiler.nodes.java.InstanceOfNode; -import org.graalvm.compiler.nodes.java.LoadFieldNode; -import org.graalvm.compiler.nodes.java.LoadIndexedNode; -import org.graalvm.compiler.nodes.java.MethodCallTargetNode; -import org.graalvm.compiler.nodes.java.MonitorEnterNode; -import org.graalvm.compiler.nodes.java.MonitorExitNode; -import org.graalvm.compiler.nodes.java.MonitorIdNode; -import org.graalvm.compiler.nodes.java.NewArrayNode; -import org.graalvm.compiler.nodes.java.NewInstanceNode; -import org.graalvm.compiler.nodes.java.NewMultiArrayNode; -import org.graalvm.compiler.nodes.java.RegisterFinalizerNode; -import org.graalvm.compiler.nodes.java.StoreFieldNode; -import org.graalvm.compiler.nodes.java.StoreIndexedNode; -import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate; -import org.graalvm.compiler.nodes.type.StampTool; -import org.graalvm.compiler.nodes.util.GraphUtil; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.util.ValueMergeUtil; -import org.graalvm.compiler.replacements.nodes.MacroInvokable; -import org.graalvm.compiler.serviceprovider.GraalServices; -import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup; +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 org.graalvm.word.LocationIdentity; import jdk.vm.ci.code.BailoutException; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BytecodeParserOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParserOptions.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BytecodeParserOptions.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParserOptions.java index 573d919f76ba..b96186ee92c4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/BytecodeParserOptions.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParserOptions.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; +import jdk.compiler.graal.options.Option; +import jdk.compiler.graal.options.OptionKey; +import jdk.compiler.graal.options.OptionType; /** * Options related to {@link BytecodeParser}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/DefaultSuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/DefaultSuitesCreator.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/DefaultSuitesCreator.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/DefaultSuitesCreator.java index 9d96742552ca..f881c7d1b948 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/DefaultSuitesCreator.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/DefaultSuitesCreator.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.CompilerConfiguration; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; +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.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/FrameStateBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/FrameStateBuilder.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/FrameStateBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/FrameStateBuilder.java index cee828606d6b..28042a7dec41 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/FrameStateBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/FrameStateBuilder.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; - -import static org.graalvm.compiler.bytecode.Bytecodes.DUP; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2_X1; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP2_X2; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP_X1; -import static org.graalvm.compiler.bytecode.Bytecodes.DUP_X2; -import static org.graalvm.compiler.bytecode.Bytecodes.POP; -import static org.graalvm.compiler.bytecode.Bytecodes.POP2; -import static org.graalvm.compiler.bytecode.Bytecodes.SWAP; -import static org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue; -import static org.graalvm.compiler.nodes.FrameState.TWO_SLOT_MARKER; -import static org.graalvm.compiler.nodes.util.GraphUtil.originalValue; +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; import java.util.ArrayList; import java.util.Arrays; @@ -43,36 +43,36 @@ import java.util.List; import java.util.function.Function; -import org.graalvm.compiler.bytecode.Bytecode; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.type.StampFactory; -import org.graalvm.compiler.core.common.type.StampPair; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.java.BciBlockMapping.BciBlock; -import org.graalvm.compiler.nodeinfo.Verbosity; -import org.graalvm.compiler.nodes.AbstractMergeNode; -import org.graalvm.compiler.nodes.ConstantNode; -import org.graalvm.compiler.nodes.FrameState; -import org.graalvm.compiler.nodes.LoopBeginNode; -import org.graalvm.compiler.nodes.LoopExitNode; -import org.graalvm.compiler.nodes.NodeView; -import org.graalvm.compiler.nodes.ParameterNode; -import org.graalvm.compiler.nodes.PhiNode; -import org.graalvm.compiler.nodes.ProxyNode; -import org.graalvm.compiler.nodes.StateSplit; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.ValueNode; -import org.graalvm.compiler.nodes.ValuePhiNode; -import org.graalvm.compiler.nodes.calc.FloatingNode; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.SideEffectsState; -import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin; -import org.graalvm.compiler.nodes.java.MonitorIdNode; +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.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.Assumptions; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/GraphBuilderPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/GraphBuilderPhase.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/GraphBuilderPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/GraphBuilderPhase.java index ef4eda51c0b8..8bd4ed529fa2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/GraphBuilderPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/GraphBuilderPhase.java @@ -22,18 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; import java.util.Optional; -import org.graalvm.compiler.nodes.GraphState; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.phases.BasePhase; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.HighTierContext; +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.vm.ci.meta.ResolvedJavaMethod; @@ -72,7 +73,7 @@ protected Instance createInstance(CoreProviders providers, GraphBuilderConfigura } // Fully qualified name is a workaround for JDK-8056066 - public static class Instance extends org.graalvm.compiler.phases.Phase { + public static class Instance extends Phase { protected final CoreProviders providers; protected final GraphBuilderConfiguration graphBuilderConfig; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java index 000827383b17..99a6fb2a3448 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/JsrNotSupportedBailout.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; -import org.graalvm.compiler.core.common.PermanentBailoutException; +import jdk.compiler.graal.core.common.PermanentBailoutException; public class JsrNotSupportedBailout extends PermanentBailoutException { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/JsrScope.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrScope.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/JsrScope.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrScope.java index 2200a13ac773..29298c7e8698 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/JsrScope.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrScope.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; -import org.graalvm.compiler.bytecode.Bytecodes; -import org.graalvm.compiler.java.BciBlockMapping.BciBlock; +import jdk.compiler.graal.bytecode.Bytecodes; +import jdk.compiler.graal.java.BciBlockMapping.BciBlock; /** * Represents a subroutine entered via {@link Bytecodes#JSR} and exited via {@link Bytecodes#RET}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LambdaUtils.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LambdaUtils.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LambdaUtils.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LambdaUtils.java index 88d649e9c58f..a5cf6ec6b9c1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LambdaUtils.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LambdaUtils.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; import java.nio.charset.StandardCharsets; import java.security.MessageDigest; @@ -34,18 +34,19 @@ import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.nodes.spi.CoreProviders; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.common.JVMCIError; import jdk.vm.ci.meta.ResolvedJavaMethod; @@ -86,7 +87,7 @@ private LambdaUtils() { * types and calls an original method. * * @param cip plugin to - * {@link ClassInitializationPlugin#loadReferencedType(org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext, jdk.vm.ci.meta.ConstantPool, int, int) + * {@link ClassInitializationPlugin#loadReferencedType(GraphBuilderContext, jdk.vm.ci.meta.ConstantPool, int, int) * load} new types * @param providers providers to use when processing the lambda code * @param lambdaType the lambda type to analyze diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LargeLocalLiveness.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LargeLocalLiveness.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LargeLocalLiveness.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LargeLocalLiveness.java index 8166b1aef43e..072ca4845292 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LargeLocalLiveness.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LargeLocalLiveness.java @@ -22,12 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; import java.util.BitSet; -import org.graalvm.compiler.java.BciBlockMapping.BciBlock; - public final class LargeLocalLiveness extends LocalLiveness { private BitSet[] localsLiveIn; private BitSet[] localsLiveOut; @@ -120,7 +118,7 @@ protected void storeOne(int blockID, int local) { localsLiveKill[blockID].set(local); } - BciBlock block = blocks[blockID]; + BciBlockMapping.BciBlock block = blocks[blockID]; BitSet loops = block.loops; for (int pos = -1; (pos = loops.nextSetBit(pos + 1)) >= 0;) { this.localsChangedInLoop[pos].set(local); @@ -128,12 +126,12 @@ protected void storeOne(int blockID, int local) { } @Override - public boolean localIsLiveIn(BciBlock block, int local) { + public boolean localIsLiveIn(BciBlockMapping.BciBlock block, int local) { return block.getId() >= Integer.MAX_VALUE ? true : localsLiveIn[block.getId()].get(local); } @Override - public boolean localIsLiveOut(BciBlock block, int local) { + public boolean localIsLiveOut(BciBlockMapping.BciBlock block, int local) { return block.getId() >= Integer.MAX_VALUE ? true : localsLiveOut[block.getId()].get(local); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LocalLiveness.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LocalLiveness.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LocalLiveness.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LocalLiveness.java index 157d4ec30ac8..3e1a10ace84e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/LocalLiveness.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LocalLiveness.java @@ -22,69 +22,69 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; - -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ALOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ASTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.DLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.DSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.FSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.IINC; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ILOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.ISTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_2; -import static org.graalvm.compiler.bytecode.Bytecodes.LLOAD_3; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_0; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_1; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_2; -import static org.graalvm.compiler.bytecode.Bytecodes.LSTORE_3; -import static org.graalvm.compiler.bytecode.Bytecodes.RET; +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; import java.util.ArrayList; import java.util.Arrays; import java.util.BitSet; import org.graalvm.collections.Pair; -import org.graalvm.compiler.bytecode.BytecodeStream; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.java.BciBlockMapping.BciBlock; +import jdk.compiler.graal.bytecode.BytecodeStream; +import jdk.compiler.graal.debug.DebugContext; +import jdk.compiler.graal.java.BciBlockMapping.BciBlock; /** * Encapsulates the liveness calculation, so that subclasses for locals ≤ 64 and locals > 64 diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/SmallLocalLiveness.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SmallLocalLiveness.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/SmallLocalLiveness.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SmallLocalLiveness.java index 7a6a36c7c952..26ca12b0875e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/SmallLocalLiveness.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SmallLocalLiveness.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; -import org.graalvm.compiler.java.BciBlockMapping.BciBlock; +import jdk.compiler.graal.java.BciBlockMapping.BciBlock; import java.util.BitSet; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/StableMethodNameFormatter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/StableMethodNameFormatter.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/StableMethodNameFormatter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/StableMethodNameFormatter.java index e93bda670aec..c83ddc30962f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/StableMethodNameFormatter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/StableMethodNameFormatter.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; +package jdk.compiler.graal.java; -import static org.graalvm.compiler.java.LambdaUtils.digest; +import static jdk.compiler.graal.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 org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.nodes.Invoke; -import org.graalvm.compiler.nodes.StructuredGraph; -import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration; -import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins; -import org.graalvm.compiler.phases.OptimisticOptimizations; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.util.Providers; +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.vm.ci.meta.ResolvedJavaMethod; import jdk.vm.ci.meta.ResolvedJavaType; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/SuitesProviderBase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SuitesProviderBase.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/SuitesProviderBase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SuitesProviderBase.java index eeea371ad37b..7f98edf9b862 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/java/SuitesProviderBase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SuitesProviderBase.java @@ -22,14 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.java; - -import org.graalvm.compiler.lir.phases.LIRSuites; -import org.graalvm.compiler.options.OptionValues; -import org.graalvm.compiler.phases.PhaseSuite; -import org.graalvm.compiler.phases.tiers.HighTierContext; -import org.graalvm.compiler.phases.tiers.Suites; -import org.graalvm.compiler.phases.tiers.SuitesCreator; +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; import jdk.vm.ci.code.Architecture; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java index 40e4696214a8..0aa2df20feb7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/BailoutAndRestartBackendException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; -import org.graalvm.compiler.core.common.PermanentBailoutException; +import jdk.compiler.graal.core.common.PermanentBailoutException; /** * Restarts the {@link LIR low-level} compilation with a modified configuration. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CastValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CastValue.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CastValue.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CastValue.java index e49d20dd84e3..3e87dfaf743f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CastValue.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CastValue.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import jdk.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CompositeValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValue.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CompositeValue.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValue.java index c6a3e69b86ce..6bd00202ece5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CompositeValue.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValue.java @@ -22,16 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; - import jdk.vm.ci.meta.Value; import jdk.vm.ci.meta.ValueKind; @@ -46,7 +43,7 @@ public abstract class CompositeValue extends Value { @Target(ElementType.FIELD) public @interface Component { - OperandFlag[] value() default OperandFlag.REG; + LIRInstruction.OperandFlag[] value() default LIRInstruction.OperandFlag.REG; } public CompositeValue(ValueKind kind) { @@ -63,9 +60,9 @@ public CompositeValue(ValueKind kind) { * @param proc * @return the original CompositeValue or a copy with any modified values */ - public abstract CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueProcedure proc); + public abstract CompositeValue forEachComponent(LIRInstruction inst, LIRInstruction.OperandMode mode, InstructionValueProcedure proc); - protected abstract void visitEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueConsumer proc); + protected abstract void visitEachComponent(LIRInstruction inst, LIRInstruction.OperandMode mode, InstructionValueConsumer proc); @Override public String toString() { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CompositeValueClass.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValueClass.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CompositeValueClass.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValueClass.java index 0872a2ad77ee..abbc0a9c1bab 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/CompositeValueClass.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValueClass.java @@ -22,21 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.reflect.Field; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.core.common.FieldIntrospection; -import org.graalvm.compiler.core.common.Fields; -import org.graalvm.compiler.core.common.FieldsScanner; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.CompositeValue.Component; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRIntrospection.LIRFieldsScanner; -import org.graalvm.compiler.lir.LIRIntrospection.OperandModeAnnotation; -import org.graalvm.compiler.lir.LIRIntrospection.Values; +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; /** * Lazily associated metadata for every {@link CompositeValue} type. The metadata includes: @@ -67,7 +63,7 @@ public static CompositeValueClass get(Class type) { return (CompositeValueClass) compositeClass.get(type); } - private final Values values; + private final LIRIntrospection.Values values; private CompositeValueClass(Class clazz) { super(clazz); @@ -75,20 +71,20 @@ private CompositeValueClass(Class clazz) { CompositeValueFieldsScanner vfs = new CompositeValueFieldsScanner(new FieldsScanner.DefaultCalcOffset()); vfs.scan(clazz, CompositeValue.class, false); - values = Values.create(vfs.valueAnnotations.get(Component.class)); + values = LIRIntrospection.Values.create(vfs.valueAnnotations.get(Component.class)); data = Fields.create(vfs.data); } - private static class CompositeValueFieldsScanner extends LIRFieldsScanner { + private static class CompositeValueFieldsScanner extends LIRIntrospection.LIRFieldsScanner { CompositeValueFieldsScanner(FieldsScanner.CalcOffset calc) { super(calc); - valueAnnotations.put(CompositeValue.Component.class, new OperandModeAnnotation()); + valueAnnotations.put(CompositeValue.Component.class, new LIRIntrospection.OperandModeAnnotation()); } @Override - protected EnumSet getFlags(Field field) { - EnumSet result = EnumSet.noneOf(OperandFlag.class); + protected EnumSet getFlags(Field field) { + EnumSet result = EnumSet.noneOf(LIRInstruction.OperandFlag.class); if (field.isAnnotationPresent(CompositeValue.Component.class)) { result.addAll(Arrays.asList(field.getAnnotation(CompositeValue.Component.class).value())); } else { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ComputeCodeEmissionOrder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ComputeCodeEmissionOrder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java index a4d01a001cb9..89d5b9caabee 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ComputeCodeEmissionOrder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; -import static org.graalvm.compiler.core.common.GraalOptions.LoopHeaderAlignment; +import static jdk.compiler.graal.core.common.GraalOptions.LoopHeaderAlignment; import java.util.ArrayList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder.ComputationTime; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; +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.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ConstantValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ConstantValue.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ConstantValue.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ConstantValue.java index 98308917b46f..740059737c98 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ConstantValue.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ConstantValue.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import jdk.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java index 0030f30f3664..0f6e7b2546af 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ControlFlowOptimizer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java @@ -22,18 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; -import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; -import static org.graalvm.compiler.lir.LIR.verifyBlocks; +import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID; import java.util.ArrayList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase; +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.vm.ci.code.TargetDescription; @@ -99,7 +98,7 @@ private void copyAlignment(BasicBlock from, BasicBlock block) { } private void deleteEmptyBlocks(int[] blocks) { - assert verifyBlocks(lir, blocks); + assert LIR.verifyBlocks(lir, blocks); for (int i = 0; i < blocks.length; i++) { BasicBlock block = lir.getBlockById(blocks[i]); if (canDeleteBlock(block)) { @@ -113,7 +112,7 @@ private void deleteEmptyBlocks(int[] blocks) { blocks[i] = INVALID_BLOCK_ID; } } - assert verifyBlocks(lir, blocks); + assert LIR.verifyBlocks(lir, blocks); } } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java index 063a6f11ac79..28cbed02cdeb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/EdgeMoveOptimizer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase; +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.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/FullInfopointOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/FullInfopointOp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/FullInfopointOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/FullInfopointOp.java index 957197202419..7cc13801d097 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/FullInfopointOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/FullInfopointOp.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.site.InfopointReason; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GenerateStub.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStub.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GenerateStub.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStub.java index cd46c1062598..f91106e54ed5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GenerateStub.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStub.java @@ -22,7 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; + +import jdk.compiler.graal.graph.Node; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -32,9 +34,8 @@ /** * Generate a stub to be called via foreign call. This annotation is valid for methods annotated - * with {@link org.graalvm.compiler.graph.Node.NodeIntrinsic} only. To trigger stub generation, a - * marker class annotated with {@link GeneratedStubsHolder} is required. Processed by - * {@code org.graalvm.compiler.lir.processor.IntrinsicStubProcessor}. + * with {@link Node.NodeIntrinsic} only. To trigger stub generation, a marker class annotated with + * {@link GeneratedStubsHolder} is required. Processed by {@code IntrinsicStubProcessor}. */ @Target(ElementType.METHOD) @Retention(RetentionPolicy.CLASS) @@ -47,10 +48,9 @@ String name() default ""; /** - * Optional values for parameters annotated with - * {@link org.graalvm.compiler.graph.Node.ConstantNodeParameter}. The string content is pasted - * as-is into the generated code, with the only exception being enum values - in that case, the - * enum class name and a dot is prepended to the string. + * Optional values for parameters annotated with {@link Node.ConstantNodeParameter}. The string + * content is pasted as-is into the generated code, with the only exception being enum values - + * in that case, the enum class name and a dot is prepended to the string. */ String[] parameters() default {}; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GenerateStubs.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStubs.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GenerateStubs.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStubs.java index 2326dac6ef9b..79af724d888e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GenerateStubs.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStubs.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GeneratedStubsHolder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GeneratedStubsHolder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java index b9789b3c2191..1003778b6025 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/GeneratedStubsHolder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -30,8 +30,7 @@ import java.lang.annotation.Target; /** - * Serves as a marker for stub generation. Processed by - * {@code org.graalvm.compiler.lir.processor.IntrinsicStubProcessor}. + * Serves as a marker for stub generation. Processed by {@code IntrinsicStubProcessor}. */ @Target(ElementType.TYPE) @Retention(RetentionPolicy.SOURCE) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ImplicitLIRFrameState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ImplicitLIRFrameState.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java index dd0cc1f5477a..6f8881ff34b8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ImplicitLIRFrameState.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.VirtualObject; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionStateProcedure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionStateProcedure.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionStateProcedure.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionStateProcedure.java index 05d29891c3dd..95db4ef20e56 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionStateProcedure.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionStateProcedure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; @FunctionalInterface public interface InstructionStateProcedure { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionValueConsumer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueConsumer.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionValueConsumer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueConsumer.java index 5792e542d039..f1790c798c88 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionValueConsumer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueConsumer.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.EnumSet; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; +import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; +import jdk.compiler.graal.lir.LIRInstruction.OperandMode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionValueProcedure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueProcedure.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionValueProcedure.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueProcedure.java index aefe92841774..8ecf68f04d4f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/InstructionValueProcedure.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueProcedure.java @@ -22,13 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.EnumSet; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; - import jdk.vm.ci.meta.Value; /** @@ -47,6 +44,6 @@ public interface InstructionValueProcedure { * @param flags A set of flags for the value. * @return The new value to replace the value that was passed in. */ - Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags); + Value doValue(LIRInstruction instruction, Value value, LIRInstruction.OperandMode mode, EnumSet flags); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIR.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIR.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIR.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIR.java index 5c6fbf175e38..41c4f97aaa56 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIR.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIR.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.ArrayList; import java.util.List; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.core.common.util.EventCounter; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.StandardOp.BlockEndOp; -import org.graalvm.compiler.lir.StandardOp.LabelHoldingOp; -import org.graalvm.compiler.lir.StandardOp.LabelOp; -import org.graalvm.compiler.lir.gen.LIRGenerator; -import org.graalvm.compiler.options.OptionValues; +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; /** * This class implements the overall container for the LIR graph and directs its construction, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRFrameState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRFrameState.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRFrameState.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRFrameState.java index b6b7d0b4d9e8..6eeb8deaf76a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRFrameState.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRFrameState.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot; +import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.util.IndexedValueMap; +import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; +import jdk.compiler.graal.lir.LIRInstruction.OperandMode; +import jdk.compiler.graal.lir.util.IndexedValueMap; import jdk.vm.ci.code.BytecodeFrame; import jdk.vm.ci.code.DebugInfo; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java similarity index 99% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java index cf49f090c57c..9d29bc1a73d8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInsertionBuffer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.ArrayList; import java.util.Arrays; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstruction.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstruction.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstruction.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstruction.java index 9c4fabbd80db..2ea9ee93bf89 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstruction.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstruction.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.OUTGOING; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandMode.ALIVE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandMode.DEF; -import static org.graalvm.compiler.lir.LIRInstruction.OperandMode.TEMP; -import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot; +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 java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -46,12 +46,12 @@ import java.util.EnumMap; import java.util.EnumSet; -import org.graalvm.compiler.graph.NodeSourcePosition; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; +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.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstructionClass.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionClass.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstructionClass.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionClass.java index c20eee680295..295c8c47ff97 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstructionClass.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionClass.java @@ -22,20 +22,20 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.reflect.Field; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.core.common.Fields; -import org.graalvm.compiler.core.common.FieldsScanner; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; +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.vm.ci.code.BytecodeFrame; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstructionVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstructionVerifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java index 32f2943e7eab..e56ffa70b8b4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRInstructionVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; public interface LIRInstructionVerifier { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRIntrospection.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRIntrospection.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRIntrospection.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRIntrospection.java index b788b256ec73..74658cd45a56 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRIntrospection.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRIntrospection.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +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 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 org.graalvm.compiler.core.common.FieldIntrospection; -import org.graalvm.compiler.core.common.Fields; -import org.graalvm.compiler.core.common.FieldsScanner; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; +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.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRValueUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRValueUtil.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRValueUtil.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRValueUtil.java index 67780f36e796..810a01929af7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LIRValueUtil.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRValueUtil.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.LIRKindWithCast; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlot; -import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlotAlias; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LabelRef.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LabelRef.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LabelRef.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LabelRef.java index 35325fed84a2..6e973d4b3ddf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/LabelRef.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LabelRef.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.lir.StandardOp.BranchOp; -import org.graalvm.compiler.lir.StandardOp.JumpOp; +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; /** * LIR instructions such as {@link JumpOp} and {@link BranchOp} need to reference their target diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/NullCheckOptimizer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/NullCheckOptimizer.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/NullCheckOptimizer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/NullCheckOptimizer.java index 205e5cb5dbc2..d5b531e24844 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/NullCheckOptimizer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/NullCheckOptimizer.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.ArrayList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.lir.StandardOp.ImplicitNullCheck; -import org.graalvm.compiler.lir.StandardOp.NullCheck; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase; +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.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/Opcode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Opcode.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/Opcode.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Opcode.java index 8c8ff20c962c..bfb4dfa1420c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/Opcode.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Opcode.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/RedundantMoveElimination.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/RedundantMoveElimination.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/RedundantMoveElimination.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/RedundantMoveElimination.java index 3f8bf2ae5973..ffc4965f735d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/RedundantMoveElimination.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/RedundantMoveElimination.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.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 org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/StandardOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StandardOp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/StandardOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StandardOp.java index 0c09d6613b7a..a747728c937f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/StandardOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StandardOp.java @@ -22,23 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; - -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.OUTGOING; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +package jdk.compiler.graal.lir; import java.util.ArrayList; import java.util.Arrays; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.framemap.FrameMap; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterSaveLayout; @@ -87,7 +82,7 @@ public static final class LabelOp extends LIRInstruction implements LabelHolding * between the label at the beginning of a block an an actual definition in the second * instruction of a block, the registers are defined here in the label. */ - @Def({REG, STACK}) private Value[] incomingValues; + @Def({OperandFlag.REG, OperandFlag.STACK}) private Value[] incomingValues; private final Label label; private int alignment; private int numbPhis; @@ -184,7 +179,7 @@ public boolean isPhiIn() { public static class JumpOp extends LIRInstruction implements BlockEndOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(JumpOp.class); - @Alive({REG, STACK, CONST, OUTGOING}) private Value[] outgoingValues; + @Alive({OperandFlag.REG, OperandFlag.STACK, OperandFlag.CONST, OperandFlag.OUTGOING}) private Value[] outgoingValues; private final LabelRef destination; @@ -310,7 +305,7 @@ public abstract static class SaveRegistersOp extends LIRInstruction { /** * The slots to which the registers are saved. */ - @Def(STACK) protected final AllocatableValue[] slots; + @Def(OperandFlag.STACK) protected final AllocatableValue[] slots; /** * @@ -426,7 +421,7 @@ public void emitCode(CompilationResultBuilder crb) { public static final class BlackholeOp extends LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(BlackholeOp.class); - @Use({REG, STACK, CONST}) private Value value; + @Use({OperandFlag.REG, OperandFlag.STACK, OperandFlag.CONST}) private Value value; public BlackholeOp(Value value) { super(TYPE); @@ -442,7 +437,7 @@ public void emitCode(CompilationResultBuilder crb) { public static final class BindToRegisterOp extends LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(BindToRegisterOp.class); - @Use({REG}) private Value value; + @Use({OperandFlag.REG}) private Value value; public BindToRegisterOp(Value value) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/StateProcedure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StateProcedure.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/StateProcedure.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StateProcedure.java index 9527cc59742d..0919046e98f9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/StateProcedure.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StateProcedure.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; @FunctionalInterface public interface StateProcedure extends InstructionStateProcedure { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SwitchStrategy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SwitchStrategy.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SwitchStrategy.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SwitchStrategy.java index fc4823d8e9e7..0739a647cc3a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SwitchStrategy.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SwitchStrategy.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.Arrays; import java.util.Comparator; -import org.graalvm.compiler.asm.Assembler; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.Constant; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SyncPort.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPort.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SyncPort.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPort.java index d7041a1519c4..2ac108ba5672 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SyncPort.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPort.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Repeatable; @@ -30,7 +30,7 @@ /** * Denotes port of a HotSpot code snippet. This information will be parsed by - * {@code org.graalvm.compiler.lir.processor.SyncPortProcessor}. + * {@code SyncPortProcessor}. */ @Target({ElementType.TYPE, ElementType.CONSTRUCTOR, ElementType.METHOD}) @Repeatable(SyncPorts.class) diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SyncPorts.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPorts.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SyncPorts.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPorts.java index 74f04cd5c3f7..1813dc91fa9e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/SyncPorts.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPorts.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.lang.annotation.ElementType; import java.lang.annotation.Target; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ValueConsumer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueConsumer.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ValueConsumer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueConsumer.java index 58b6bac9fd6e..d0ef02d1bbce 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ValueConsumer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueConsumer.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.EnumSet; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; +import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; +import jdk.compiler.graal.lir.LIRInstruction.OperandMode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ValueProcedure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueProcedure.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ValueProcedure.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueProcedure.java index 6874ab6a4b58..a5297dd9e94f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ValueProcedure.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueProcedure.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import java.util.EnumSet; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; +import jdk.compiler.graal.lir.LIRInstruction.OperandFlag; +import jdk.compiler.graal.lir.LIRInstruction.OperandMode; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/Variable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Variable.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/Variable.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Variable.java index e43dff67b1ab..6857fd4da3ae 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/Variable.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Variable.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import jdk.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/VirtualStackSlot.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/VirtualStackSlot.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/VirtualStackSlot.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/VirtualStackSlot.java index 76aa36efe814..564d47542b9e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/VirtualStackSlot.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/VirtualStackSlot.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir; +package jdk.compiler.graal.lir; import jdk.vm.ci.code.StackSlot; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AESDecryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AESDecryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java index 1f8155fe0479..9b8554a36038 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AESDecryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CodeUtil; @@ -67,11 +67,11 @@ public final class AArch64AESDecryptOp extends AArch64LIRInstruction { private final int lengthOffset; - @Alive({REG}) private Value fromValue; - @Alive({REG}) private Value toValue; - @Alive({REG}) private Value keyValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value fromValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value toValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value keyValue; - @Temp({REG}) private Value[] temps; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) private Value[] temps; public AArch64AESDecryptOp(Value fromValue, Value toValue, Value keyValue, int lengthOffset) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AESEncryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AESEncryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java index ada34253ddfe..ee9052642038 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AESEncryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AcrossVectorOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AcrossVectorOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java index 6f59a02191f1..9ca27692dc37 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AcrossVectorOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java index baf570f4990a..1a052eafee08 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AddressValue.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java @@ -22,23 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.isImmediateScaled; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.REGISTER_OFFSET; +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 java.util.EnumSet; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.CompositeValue; -import org.graalvm.compiler.lir.InstructionValueConsumer; -import org.graalvm.compiler.lir.InstructionValueProcedure; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; @@ -48,10 +47,10 @@ import jdk.vm.ci.meta.ValueKind; public final class AArch64AddressValue extends CompositeValue { - private static final EnumSet flags = EnumSet.of(OperandFlag.REG, OperandFlag.ILLEGAL); + private static final EnumSet flags = EnumSet.of(LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL); - @Component({OperandFlag.REG, OperandFlag.ILLEGAL}) protected AllocatableValue base; - @Component({OperandFlag.REG, OperandFlag.ILLEGAL}) protected AllocatableValue offset; + @Component({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected AllocatableValue base; + @Component({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected AllocatableValue offset; private final int bitMemoryTransferSize; private final int displacement; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java index 12937921ffbd..4b3310300d63 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArithmeticOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.ADDSUBTRACT; -import static org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.LOGICAL; -import static org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.NONE; -import static org.graalvm.compiler.lir.aarch64.AArch64ArithmeticOp.ARMv8ConstantCategory.SHIFT; - -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCompareToOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCompareToOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java index ac20e9a41745..2dd44fec9569 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCompareToOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java @@ -22,23 +22,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java index f90024dc37b4..b2c4cee7b6a0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createImmediateAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createRegisterOffsetAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.StrideUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java index 398bb566ec39..d0126dd850c1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayEqualsOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD2_MULTIPLE_2R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD4_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createImmediateAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createStructureNoOffsetAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.StrideUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayIndexOfOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayIndexOfOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java index ca35e92aecfc..0cf99632fbf5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayIndexOfOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java @@ -23,34 +23,34 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD2_MULTIPLE_2R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD4_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayRegionCompareToOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayRegionCompareToOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java index 602231d6b56a..57fbf3b9d95d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ArrayRegionCompareToOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java @@ -22,37 +22,37 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.fromStride; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.StrideUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java index af073574594c..17f2f07eabac 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64AtomicMove.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java @@ -22,27 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.sp; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.CONST; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; import java.util.function.Consumer; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.memory.MemoryOrderMode; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerator; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java index 830a5580c7c0..68909a1cbfbd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerMulAddOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java @@ -22,25 +22,25 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PRE_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.EQ; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.NE; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType.LSL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java index a6e8482dbaf1..68a2ea5335bc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.MI; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType.UXTW; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java index 965ae6c4ed0b..5166d939e2a5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BigIntegerSquareToLenOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.r10; import static jdk.vm.ci.aarch64.AArch64.r11; @@ -40,14 +40,13 @@ import static jdk.vm.ci.aarch64.AArch64.r5; import static jdk.vm.ci.aarch64.AArch64.r6; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.aarch64.AArch64BigIntegerMultiplyToLenOp.multiplyToLen; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; @@ -61,12 +60,12 @@ public final class AArch64BigIntegerSquareToLenOp extends AArch64LIRInstruction public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64BigIntegerSquareToLenOp.class); - @Alive({REG}) private Value xValue; - @Alive({REG}) private Value lenValue; - @Alive({REG}) private Value zValue; - @Alive({REG}) private Value zlenValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value xValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value lenValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value zValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value zlenValue; - @Temp protected Value[] temps; + @LIRInstruction.Temp protected Value[] temps; public AArch64BigIntegerSquareToLenOp( Value xValue, @@ -116,7 +115,7 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { masm.mov(64, y, x); masm.mov(32, ylen, xlen); - multiplyToLen(masm, x, xlen, y, ylen, z, zlen, + AArch64BigIntegerMultiplyToLenOp.multiplyToLen(masm, x, xlen, y, ylen, z, zlen, r10, r11, r12, r13, r14, r15, r16, r17, r19, r20, r21, r22, r23); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitFieldOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitFieldOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java index 7a6faee7a22d..1cbf46b45c2e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitFieldOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java @@ -24,18 +24,18 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; /** * Bit field ops for AArch64. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java index 9f10e197790b..4e78f1a9a17f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitManipulationOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitSwapOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitSwapOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java index ae328b89f13d..342f5c108451 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BitSwapOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; @@ -43,8 +43,8 @@ public class AArch64BitSwapOp extends AArch64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64BitSwapOp.class); - @Def({REG}) protected AllocatableValue result; - @Use({REG}) protected AllocatableValue input; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue input; public AArch64BitSwapOp(AllocatableValue result, AllocatableValue input) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java index fb821524004a..cb11d4c2b5e8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BlockEndOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java @@ -23,13 +23,13 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.StandardOp.BlockEndOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; public abstract class AArch64BlockEndOp extends LIRInstruction implements BlockEndOp { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java index bd2a62b018e8..191700bcd66f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64BreakpointOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java @@ -22,16 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; - -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.AArch64ExceptionCode; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.Value; @@ -42,7 +40,7 @@ public class AArch64BreakpointOp extends AArch64LIRInstruction { /** * A set of values loaded into the Java ABI parameter locations (for inspection by a debugger). */ - @Use({REG, STACK}) private Value[] parameters; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) private Value[] parameters; public AArch64BreakpointOp(Value[] parameters) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java index 096ca53fc120..d70f1f8c0796 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ByteSwap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CacheWritebackOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CacheWritebackOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java index f3b89d63a42e..d7c2fb082dcd 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CacheWritebackOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java @@ -23,13 +23,13 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.lir.LIRInstructionClass; /** * Implements {@code jdk.internal.misc.Unsafe.writeback0(long)}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CacheWritebackPostSyncOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CacheWritebackPostSyncOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java index e2d9e2592628..36e141d45aac 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CacheWritebackPostSyncOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.lir.LIRInstructionClass; /** * Implements {@code jdk.internal.misc.Unsafe.writebackPostSync0(long)}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CalcStringAttributesOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CalcStringAttributesOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java index 6453a3f28073..02505fcaa1ba 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CalcStringAttributesOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java @@ -22,51 +22,51 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createImmediateAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createPairBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createRegisterOffsetAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_16; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_32; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_8; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java index ef9adc1a1028..7cf8a75cc141 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Call.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java @@ -23,23 +23,23 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp.LabelHoldingOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; +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 jdk.vm.ci.code.Register; import jdk.vm.ci.code.site.Call; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java index a1d514840f49..db0c294a375a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java index 6fd7a92d8bb0..eb6339071e94 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java index 7a19cbd20f8b..78e4e338a440 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Compare.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java @@ -22,26 +22,26 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; - -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerator; +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 jdk.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ComplexVectorOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ComplexVectorOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java index ffc907bfea9a..abbe3ff91004 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ComplexVectorOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.SIMD; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; +import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; +import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.Word; import java.util.Arrays; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java index 9d3ff4637a06..bb5f6bdf1359 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ControlFlow.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java @@ -22,40 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.lr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; import java.util.Arrays; import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Stream; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ExtendType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.code.CompilationResult.JumpTable; -import org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.SwitchStrategy.BaseSwitchClosure; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Convert.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Convert.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java index 5fce3f44c5e2..503d62708560 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Convert.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.calc.FloatConvert; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CountPositivesOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CountPositivesOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java index 5a6c1e0dc447..26b68a4d4960 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CountPositivesOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createStructureImmediatePostIndexAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_POST_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_UNSIGNED_SCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.PrefetchMode.PLDL1KEEP; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType.LSL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.aarch64.AArch64LIRGenerator; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.Register; @@ -78,13 +78,13 @@ public final class AArch64CountPositivesOp extends AArch64ComplexVectorOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64CountPositivesOp.class); - @Def({REG}) private Value resultValue; - @Alive({REG}) private Value arrayValue; - @Alive({REG}) private Value lengthValue; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) private Value resultValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value arrayValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) private Value lengthValue; - @Temp({REG}) private Value arrayTempValue; - @Temp({REG}) private Value lengthTempValue; - @Temp({REG}) private Value[] temp; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) private Value arrayTempValue; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) private Value lengthTempValue; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) private Value[] temp; private final int vmPageSize; private final int softwarePrefetchHintDistance; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CounterModeAESCryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CounterModeAESCryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java index dbd78a4cd6e2..a856ef704a26 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64CounterModeAESCryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.aarch64.AArch64AESEncryptOp.aesecbEncrypt; -import static org.graalvm.compiler.lir.aarch64.AArch64AESEncryptOp.aesencLoadkeys; -import static org.graalvm.compiler.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64EncodeArrayOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64EncodeArrayOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java index 76bfbf916470..d07f12fb60de 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64EncodeArrayOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createImmediateAddress; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.PrefetchMode; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.CharsetName; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FloatToHalfFloatOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java similarity index 75% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FloatToHalfFloatOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java index 8b0daf16a912..4cd4e0a8c5eb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FloatToHalfFloatOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.DoubleWord; +import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; @@ -45,10 +45,10 @@ public class AArch64FloatToHalfFloatOp extends AArch64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64FloatToHalfFloatOp.class); - @Def({REG}) protected Value dstValue; - @Alive({REG}) protected Value srcValue; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected Value dstValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected Value srcValue; - @Temp({REG}) protected Value tmpValue; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) protected Value tmpValue; public AArch64FloatToHalfFloatOp(LIRGeneratorTool tool, Value dstValue, Value srcValue) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java index cd537816c161..01d4cd96d610 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.framemap.FrameMap; +import jdk.compiler.graal.core.common.LIRKind; +import jdk.compiler.graal.lir.framemap.FrameMap; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.CodeCacheProvider; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java index d30eb511477d..963810aae771 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64FrameMapBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.framemap.FrameMapBuilderImpl; +import jdk.compiler.graal.lir.framemap.FrameMap; +import jdk.compiler.graal.lir.framemap.FrameMapBuilderImpl; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64GHASHProcessBlocksOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64GHASHProcessBlocksOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java index be759c5bb454..37398f66ca70 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64GHASHProcessBlocksOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; +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 java.util.Arrays; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64HalfFloatToFloatOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64HalfFloatToFloatOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java index ca1945e80e04..1f8a2ffe248c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64HalfFloatToFloatOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.asm.aarch64.AArch64ASIMDAssembler.ElementSize.HalfWord; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64HaltOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64HaltOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java index 39660290292c..ea17781c5f71 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64HaltOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Emits a pause. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64LIRFlags.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64LIRFlags.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java index de3e34ad4919..226101684363 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64LIRFlags.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java @@ -22,11 +22,11 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import java.util.EnumSet; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; +import jdk.compiler.graal.asm.aarch64.AArch64Assembler; import jdk.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64.CPUFeature; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java index 35aefac57bdc..2b488666134e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64LIRInstruction.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; public abstract class AArch64LIRInstruction extends LIRInstruction { protected AArch64LIRInstruction(LIRInstructionClass c) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MD5Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MD5Op.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java index 2231226e1c5e..a6d9772297b3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MD5Op.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_PAIR_SIGNED_SCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathCopySignOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathCopySignOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java index e288ba2dc202..5548d230f36d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathCopySignOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java index 94497a004a86..c414362e616c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathIntrinsicBinaryOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.gen.LIRGenerator; +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.vm.ci.aarch64.AArch64; import jdk.vm.ci.aarch64.AArch64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathSignumOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathSignumOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java index c1df7a12df0d..e21a41c3e481 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64MathSignumOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java index 8de7a500a2ed..91f32a0f56a5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64Move.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED; -import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; +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 java.util.function.Function; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.CompressEncoding; -import org.graalvm.compiler.core.common.memory.MemoryExtendKind; -import org.graalvm.compiler.core.common.spi.LIRKindTool; -import org.graalvm.compiler.core.common.type.DataPointerConstant; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.NullCheck; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.MemoryBarriers; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java index 76069ac4df60..06cb8bf3b292 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java @@ -22,17 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java index 291afaf8956c..cd886d6ab213 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PauseOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Emits a pause. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PermuteOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PermuteOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java index c0f6e235a0b6..25a05c70b1df 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PermuteOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java index ee02d3c95dd9..e90f22a72870 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64PrefetchOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java @@ -23,14 +23,14 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.COMPOSITE; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.PrefetchMode; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; public final class AArch64PrefetchOp extends AArch64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64PrefetchOp.class); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ReadTimestampCounter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ReadTimestampCounter.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java index 271d3135c197..9a821ce9f416 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ReadTimestampCounter.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java index a343c518512f..5f3b3515b5a0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ReinterpretOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java @@ -23,13 +23,13 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.lir.LIRInstructionClass; import jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java index e3d5bc841dc6..a88465c21143 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64RestoreRegistersOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java @@ -23,21 +23,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isStackSlot; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.STACK; import java.util.Arrays; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64RoundFloatToIntegerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java similarity index 85% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64RoundFloatToIntegerOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java index 3d34fa5f37c0..0f338b3fb595 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64RoundFloatToIntegerOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java @@ -22,20 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; @@ -53,10 +52,10 @@ public class AArch64RoundFloatToIntegerOp extends AArch64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64RoundFloatToIntegerOp.class); - @Def({REG, HINT}) protected AllocatableValue result; - @Alive({REG}) protected AllocatableValue input; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected AllocatableValue input; - @Temp({REG}) protected AllocatableValue tmp; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) protected AllocatableValue tmp; public AArch64RoundFloatToIntegerOp(LIRGeneratorTool tool, AllocatableValue result, AllocatableValue input) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA1Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA1Op.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java index 4b72846d750e..a2d36a98cfb1 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA1Op.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.HalfReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_SIGNED_UNSCALED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA256Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA256Op.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java index d29408e0670f..3805382f471e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA256Op.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.v0; import static jdk.vm.ci.aarch64.AArch64.v1; @@ -52,24 +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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.LE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.aarch64.AArch64AESEncryptOp.asFloatRegister; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; @@ -254,7 +253,7 @@ public void emitCode(CompilationResultBuilder crb, AArch64MacroAssembler masm) { } masm.neon.orrVVV(FullReg, v4, v2, v2); if (round < 15) { - masm.neon.addVVV(FullReg, ElementSize.Word, tmp1, d1, asFloatRegister(v0, round + 17)); + masm.neon.addVVV(FullReg, ElementSize.Word, tmp1, d1, AArch64AESEncryptOp.asFloatRegister(v0, round + 17)); } masm.neon.sha256h(v2, v3, tmp2); masm.neon.sha256h2(v3, v4, tmp2); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA3Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA3Op.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java index b745877d42ab..a69b774b4a85 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA3Op.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_2R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_3R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.ST1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.HalfReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode.IMMEDIATE_POST_INDEXED; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA512Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA512Op.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java index 19ec8c4e8797..00ae3c7f2758 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SHA512Op.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_1R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDInstruction.LD1_MULTIPLE_4R; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag.LE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java index 22de68ab664d..d1f5158099b4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SaveRegistersOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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.vm.ci.aarch64.AArch64Kind; import org.graalvm.collections.EconomicSet; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java index 7da887275fe1..fb534bedfa5d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SpeculativeBarrier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java @@ -23,11 +23,11 @@ * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.lir.LIRInstructionClass; public class AArch64SpeculativeBarrier extends AArch64LIRInstruction { private static final LIRInstructionClass TYPE = LIRInstructionClass.create(AArch64SpeculativeBarrier.class); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SpinWaitOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SpinWaitOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java index a749826ab787..10e71c3ec428 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64SpinWaitOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import java.util.function.Consumer; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Emits spin wait instruction(s). diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64StringLatin1InflateOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64StringLatin1InflateOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java index 078adc968195..2af885fd9300 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64StringLatin1InflateOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java @@ -23,22 +23,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.SIMD; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64StringUTF16CompressOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64StringUTF16CompressOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java index d9d81c00af67..8dadd05a3417 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64StringUTF16CompressOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java @@ -23,27 +23,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64VectorizedMismatchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64VectorizedMismatchOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java index b7295ade5ca3..a398e6cb002e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64VectorizedMismatchOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java @@ -22,28 +22,28 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ASIMDSize.FullReg; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createBaseRegisterOnlyAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64Address.createImmediateAddress; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_BRANCH_TARGET_ALIGNMENT; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64ASIMDAssembler.ElementSize; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java index 7418ec28cd49..72d1609defa0 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZapRegistersOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; +import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.compiler.graal.lir.Opcode; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; import jdk.vm.ci.aarch64.AArch64Kind; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.asm.aarch64.AArch64MacroAssembler; import jdk.vm.ci.code.Register; import jdk.vm.ci.meta.JavaConstant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java index 4a5534f916bd..833109ab6e48 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZapStackOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.aarch64.AArch64Kind; import jdk.vm.ci.code.StackSlot; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZeroMemoryOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZeroMemoryOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java index 2de2a82e39b9..2473aed483a9 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/aarch64/AArch64ZeroMemoryOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java @@ -23,21 +23,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.aarch64; +package jdk.compiler.graal.lir.aarch64; import static jdk.vm.ci.aarch64.AArch64.zr; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.PREFERRED_LOOP_ALIGNMENT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.aarch64.AArch64Address; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler; -import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.code.CodeUtil; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java similarity index 82% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java index 57fa0396280e..70ef8a5d132c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/AllocationStageVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java @@ -22,19 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc; +package jdk.compiler.graal.lir.alloc; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot; +import static jdk.compiler.graal.lir.LIRValueUtil.isVariable; +import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot; import java.util.EnumSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java index 65e55dc8f4c5..ad9297f15762 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/OutOfRegistersException.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc; +package jdk.compiler.graal.lir.alloc; -import org.graalvm.compiler.lir.BailoutAndRestartBackendException; +import jdk.compiler.graal.lir.BailoutAndRestartBackendException; /** * Thrown if the register allocator runs out of registers. This should never happen in normal mode. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/RegisterAllocationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/RegisterAllocationPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java index c80e02a776d3..8ababe2be59d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/RegisterAllocationPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc; +package jdk.compiler.graal.lir.alloc; -import org.graalvm.compiler.lir.phases.AllocationPhase; +import jdk.compiler.graal.lir.phases.AllocationPhase; /** * Marker class for register allocation phases. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java index 8b9050a1e7f5..69c8d0d0d4d5 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/SaveCalleeSaveRegisters.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java @@ -22,22 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc; +package jdk.compiler.graal.lir.alloc; import java.util.ArrayList; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInsertionBuffer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.MoveFactory; -import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase; -import org.graalvm.compiler.lir.util.RegisterMap; +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.vm.ci.code.Architecture; import jdk.vm.ci.code.Register; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java index f717d8d7ed98..c751ac9df75f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/Interval.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java @@ -22,29 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; 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 org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.Collections; import java.util.EnumSet; import java.util.List; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.util.IntList; -import org.graalvm.compiler.core.common.util.Util; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.Variable; +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.vm.ci.code.RegisterValue; import jdk.vm.ci.code.StackSlot; @@ -557,8 +555,8 @@ void assignLocation(AllocatableValue newLocation) { } else if (isIllegal(newLocation)) { assert canMaterialize(); } else { - assert this.location == null || isRegister(this.location) || (isVirtualStackSlot(this.location) && isStackSlot(newLocation)) : "cannot re-assign location for " + this; - assert isStackSlotValue(newLocation); + assert this.location == null || isRegister(this.location) || (LIRValueUtil.isVirtualStackSlot(this.location) && isStackSlot(newLocation)) : "cannot re-assign location for " + this; + assert LIRValueUtil.isStackSlotValue(newLocation); assert !newLocation.getValueKind().equals(LIRKind.Illegal); assert newLocation.getValueKind().equals(this.kind); } @@ -632,8 +630,8 @@ public AllocatableValue spillSlot() { } public void setSpillSlot(AllocatableValue slot) { - assert isStackSlotValue(slot); - assert splitParent().spillSlot == null || (isVirtualStackSlot(splitParent().spillSlot) && isStackSlot(slot)) : "connot overwrite existing spill slot"; + assert LIRValueUtil.isStackSlotValue(slot); + assert splitParent().spillSlot == null || (LIRValueUtil.isVirtualStackSlot(splitParent().spillSlot) && isStackSlot(slot)) : "connot overwrite existing spill slot"; splitParent().spillSlot = slot; } @@ -724,7 +722,7 @@ int currentIntersectsAt(Interval it) { if (isRegister(operand)) { location = operand; } else { - assert isIllegal(operand) || isVariable(operand); + assert isIllegal(operand) || LIRValueUtil.isVariable(operand); } this.kind = LIRKind.Illegal; this.first = rangeEndMarker; @@ -957,7 +955,7 @@ private RegisterPriority adaptPriority(RegisterPriority priority) { // Note: use positions are sorted descending . first use has highest index int firstUsage(RegisterPriority minRegisterPriority) { - assert isVariable(operand) : "cannot access use positions for fixed intervals"; + assert LIRValueUtil.isVariable(operand) : "cannot access use positions for fixed intervals"; for (int i = usePosList.size() - 1; i >= 0; --i) { RegisterPriority registerPriority = adaptPriority(usePosList.registerPriority(i)); @@ -969,7 +967,7 @@ int firstUsage(RegisterPriority minRegisterPriority) { } int nextUsage(RegisterPriority minRegisterPriority, int from) { - assert isVariable(operand) : "cannot access use positions for fixed intervals"; + assert LIRValueUtil.isVariable(operand) : "cannot access use positions for fixed intervals"; for (int i = usePosList.size() - 1; i >= 0; --i) { int usePos = usePosList.usePos(i); @@ -981,7 +979,7 @@ int nextUsage(RegisterPriority minRegisterPriority, int from) { } int nextUsageExact(RegisterPriority exactRegisterPriority, int from) { - assert isVariable(operand) : "cannot access use positions for fixed intervals"; + assert LIRValueUtil.isVariable(operand) : "cannot access use positions for fixed intervals"; for (int i = usePosList.size() - 1; i >= 0; --i) { int usePos = usePosList.usePos(i); @@ -993,7 +991,7 @@ int nextUsageExact(RegisterPriority exactRegisterPriority, int from) { } int previousUsage(RegisterPriority minRegisterPriority, int from) { - assert isVariable(operand) : "cannot access use positions for fixed intervals"; + assert LIRValueUtil.isVariable(operand) : "cannot access use positions for fixed intervals"; int prev = -1; for (int i = usePosList.size() - 1; i >= 0; --i) { @@ -1012,7 +1010,7 @@ public void addUsePos(int pos, RegisterPriority registerPriority, boolean detail assert covers(pos, LIRInstruction.OperandMode.USE) : String.format("use position %d not covered by live range of interval %s", pos, this); // do not add use positions for precolored intervals because they are never used - if (registerPriority != RegisterPriority.None && isVariable(operand)) { + if (registerPriority != RegisterPriority.None && LIRValueUtil.isVariable(operand)) { if (detailedAsserts) { for (int i = 0; i < usePosList.size(); i++) { assert pos <= usePosList.usePos(i) : "already added a use-position with lower position"; @@ -1087,7 +1085,7 @@ Interval newSplitChild(LinearScan allocator) { * @return the child interval split off from this interval */ Interval split(int splitPos, LinearScan allocator) { - assert isVariable(operand) : "cannot split fixed intervals"; + assert LIRValueUtil.isVariable(operand) : "cannot split fixed intervals"; // allocate new interval Interval result = newSplitChild(allocator); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java index 1004bfe824b2..003f1ed6beba 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/IntervalWalker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterBinding; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterBindingLists; -import org.graalvm.compiler.lir.alloc.lsra.Interval.State; +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; /** */ diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java index f926cbd441c0..972f55664985 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java @@ -22,45 +22,42 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.CodeUtil.isEven; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isIllegal; import static jdk.vm.ci.code.ValueUtil.isLegal; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.asVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.stripCast; -import static org.graalvm.compiler.lir.phases.LIRPhase.Options.LIROptimization; import java.util.ArrayList; 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 org.graalvm.collections.Pair; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.framemap.FrameMapBuilder; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.MoveFactory; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.options.NestedBooleanOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; -import org.graalvm.compiler.options.OptionValues; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; @@ -80,7 +77,7 @@ public class LinearScan { public static class Options { // @formatter:off @Option(help = "Enable spill position optimization", type = OptionType.Debug) - public static final OptionKey LIROptLSRAOptimizeSpillPosition = new NestedBooleanOptionKey(LIROptimization, true); + public static final OptionKey LIROptLSRAOptimizeSpillPosition = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true); // @formatter:on } @@ -268,7 +265,7 @@ protected MoveResolver createMoveResolver() { } public static boolean isVariableOrRegister(Value value) { - return isVariable(value) || isRegister(value); + return LIRValueUtil.isVariable(value) || isRegister(value); } /** @@ -277,14 +274,14 @@ public static boolean isVariableOrRegister(Value value) { * by this allocator. */ int operandNumber(Value op) { - Value operand = stripCast(op); + Value operand = LIRValueUtil.stripCast(op); if (isRegister(operand)) { int number = asRegister(operand).number; assert number < firstVariableNumber; return number; } - assert isVariable(operand) : operand; - return firstVariableNumber + asVariable(operand).index; + assert LIRValueUtil.isVariable(operand) : operand; + return firstVariableNumber + LIRValueUtil.asVariable(operand).index; } /** @@ -321,7 +318,7 @@ public boolean apply(Interval i) { @Override public boolean apply(Interval i) { - return isVariable(i.operand); + return LIRValueUtil.isVariable(i.operand); } }; @@ -702,7 +699,7 @@ static AllocatableValue canonicalSpillOpr(Interval interval) { return interval.spillSlot(); } - boolean isMaterialized(AllocatableValue operand, int opId, OperandMode mode) { + boolean isMaterialized(AllocatableValue operand, int opId, LIRInstruction.OperandMode mode) { Interval interval = intervalFor(operand); assert interval != null : "interval must exist"; @@ -722,7 +719,7 @@ boolean isCallerSave(Value operand) { } @SuppressWarnings("try") - protected void allocate(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void allocate(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { /* * This is the point to enable debug logging for the whole register allocation. */ @@ -845,7 +842,7 @@ protected void verifyIntervals() { throw new GraalError(""); } - if (isVariable(i1.operand) && i1.kind().equals(LIRKind.Illegal)) { + if (LIRValueUtil.isVariable(i1.operand) && i1.kind().equals(LIRKind.Illegal)) { debug.log("Interval %d has no type assigned", i1.operandNumber); debug.log(i1.logString(this)); throw new GraalError(""); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java index d3c160775665..e412fd343ccb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAllocationPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.lir.phases.LIRPhase; +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.vm.ci.code.TargetDescription; @@ -43,12 +43,12 @@ public final String toString() { return getName().toString(); } - public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { apply(target, lirGenRes, context, true); } @SuppressWarnings("try") - public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context, boolean dumpLIR) { + public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context, boolean dumpLIR) { DebugContext debug = lirGenRes.getLIR().getDebug(); CharSequence name = getName(); try (DebugContext.Scope s = debug.scope(name, this); CompilerPhaseScope cps = debug.enterCompilerPhase(name);) { @@ -63,6 +63,6 @@ public final void apply(TargetDescription target, LIRGenerationResult lirGenRes, } } - protected abstract void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context); + protected abstract void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java index 3d7ba1cb0c75..e04991aedf82 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanAssignLocationsPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java @@ -22,37 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.isIllegal; -import static org.graalvm.compiler.lir.LIRValueUtil.asVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.changeValueKind; -import static org.graalvm.compiler.lir.LIRValueUtil.isCast; -import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot; import java.util.ArrayList; import java.util.Collections; import java.util.EnumSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.CastValue; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.InstructionValueProcedure; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.code.ValueUtil; @@ -71,7 +61,7 @@ public LinearScanAssignLocationsPhase(LinearScan allocator) { } @Override - protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { assignLocations(); } @@ -83,7 +73,7 @@ protected void run(TargetDescription target, LIRGenerationResult lirGenRes, Allo * @param mode the usage mode for {@code operand} by the instruction * @return the location assigned for the operand */ - protected Value colorLirOperand(LIRInstruction op, Variable operand, OperandMode mode) { + protected Value colorLirOperand(LIRInstruction op, Variable operand, LIRInstruction.OperandMode mode) { int opId = op.id(); Interval interval = allocator.intervalFor(operand); assert interval != null : "interval must exist"; @@ -116,18 +106,18 @@ protected Value colorLirOperand(LIRInstruction op, Variable operand, OperandMode } if (isIllegal(interval.location()) && interval.canMaterialize()) { - assert mode != OperandMode.DEF; + assert mode != LIRInstruction.OperandMode.DEF; return new ConstantValue(interval.kind(), interval.getMaterializedValue()); } return interval.location(); } private Value debugInfoProcedure(LIRInstruction op, Value operand) { - if (isVirtualStackSlot(operand) || ValueUtil.isRegister(operand)) { + if (LIRValueUtil.isVirtualStackSlot(operand) || ValueUtil.isRegister(operand)) { return operand; } int tempOpId = op.id(); - OperandMode mode = OperandMode.USE; + LIRInstruction.OperandMode mode = LIRInstruction.OperandMode.USE; BasicBlock block = allocator.blockForId(tempOpId); if (block.getSuccessorCount() == 1 && tempOpId == allocator.getLastLirInstructionId(block)) { /* @@ -142,7 +132,7 @@ private Value debugInfoProcedure(LIRInstruction op, Value operand) { if (instr instanceof StandardOp.JumpOp) { if (allocator.getBlockData(block).liveOut.get(allocator.operandNumber(operand))) { tempOpId = allocator.getFirstLirInstructionId(block.getSuccessorAt(0)); - mode = OperandMode.DEF; + mode = LIRInstruction.OperandMode.DEF; } } } @@ -152,8 +142,9 @@ private Value debugInfoProcedure(LIRInstruction op, Value operand) { * considered when building the intervals if the interval is not live, colorLirOperand will * cause an assert on failure. */ - Value result = colorLirOperand(op, asVariable(operand), mode); - assert !allocator.hasCall(tempOpId) || isStackSlotValue(result) || isJavaConstant(result) || !allocator.isCallerSave(result) : "cannot have caller-save register operands at calls"; + Value result = colorLirOperand(op, LIRValueUtil.asVariable(operand), mode); + assert !allocator.hasCall(tempOpId) || LIRValueUtil.isStackSlotValue(result) || LIRValueUtil.isJavaConstant(result) || + !allocator.isCallerSave(result) : "cannot have caller-save register operands at calls"; return result; } @@ -191,28 +182,28 @@ private void assignLocations(ArrayList instructions) { private final InstructionValueProcedure assignProc = new InstructionValueProcedure() { @Override - public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { - if (isVariable(value)) { - Value location = colorLirOperand(instruction, asVariable(value), mode); - if (isCast(value)) { + public Value doValue(LIRInstruction instruction, Value value, LIRInstruction.OperandMode mode, EnumSet flags) { + if (LIRValueUtil.isVariable(value)) { + Value location = colorLirOperand(instruction, LIRValueUtil.asVariable(value), mode); + if (LIRValueUtil.isCast(value)) { GraalError.guarantee(mode == LIRInstruction.OperandMode.USE || mode == LIRInstruction.OperandMode.ALIVE, "Invalid application of CastValue"); // return the same location, but with the cast's kind. CastValue cast = (CastValue) value; - return changeValueKind(location, cast.getValueKind(), true); + return LIRValueUtil.changeValueKind(location, cast.getValueKind(), true); } return location; - } else if (isCast(value)) { + } else if (LIRValueUtil.isCast(value)) { GraalError.guarantee(mode == LIRInstruction.OperandMode.USE || mode == LIRInstruction.OperandMode.ALIVE, "Invalid application of CastValue"); // strip CastValue: return underlying value, but with the cast's kind. CastValue cast = (CastValue) value; - return changeValueKind(cast.underlyingValue(), cast.getValueKind(), false); + return LIRValueUtil.changeValueKind(cast.underlyingValue(), cast.getValueKind(), false); } return value; } }; private final InstructionValueProcedure debugInfoProc = new InstructionValueProcedure() { @Override - public Value doValue(LIRInstruction instruction, Value value, OperandMode mode, EnumSet flags) { + public Value doValue(LIRInstruction instruction, Value value, LIRInstruction.OperandMode mode, EnumSet flags) { return debugInfoProcedure(instruction, value); } }; @@ -229,9 +220,9 @@ protected LIRInstruction assignLocations(LIRInstruction inputOp) { LIRInstruction op = inputOp; // remove useless moves - if (MoveOp.isMoveOp(op)) { - AllocatableValue result = MoveOp.asMoveOp(op).getResult(); - if (isVariable(result) && allocator.isMaterialized(result, op.id(), OperandMode.DEF)) { + if (StandardOp.MoveOp.isMoveOp(op)) { + AllocatableValue result = StandardOp.MoveOp.asMoveOp(op).getResult(); + if (LIRValueUtil.isVariable(result) && allocator.isMaterialized(result, op.id(), LIRInstruction.OperandMode.DEF)) { /* * This happens if a materializable interval is originally not spilled but then * kicked out in LinearScanWalker.splitForSpilling(). When kicking out such an @@ -241,11 +232,11 @@ protected LIRInstruction assignLocations(LIRInstruction inputOp) { } } - if (ValueMoveOp.isValueMoveOp(op)) { - ValueMoveOp valueMoveOp = ValueMoveOp.asValueMoveOp(op); + if (StandardOp.ValueMoveOp.isValueMoveOp(op)) { + StandardOp.ValueMoveOp valueMoveOp = StandardOp.ValueMoveOp.asValueMoveOp(op); AllocatableValue input = valueMoveOp.getInput(); - if (isVariable(input)) { - Value inputOperand = colorLirOperand(op, asVariable(input), OperandMode.USE); + if (LIRValueUtil.isVariable(input)) { + Value inputOperand = colorLirOperand(op, LIRValueUtil.asVariable(input), LIRInstruction.OperandMode.USE); if (inputOperand instanceof ConstantValue) { // Replace the ValueMoveOp with a constant materialization op = allocator.getSpillMoveFactory().createLoad(valueMoveOp.getResult(), ((ConstantValue) inputOperand).getConstant()); @@ -262,8 +253,8 @@ protected LIRInstruction assignLocations(LIRInstruction inputOp) { op.forEachState(debugInfoProc); // remove useless moves - if (ValueMoveOp.isValueMoveOp(op)) { - ValueMoveOp move = ValueMoveOp.asValueMoveOp(op); + if (StandardOp.ValueMoveOp.isValueMoveOp(op)) { + StandardOp.ValueMoveOp move = StandardOp.ValueMoveOp.asValueMoveOp(op); if (move.getInput().equals(move.getResult())) { return null; } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java index 42cd2151c10a..76586467cddc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java @@ -22,32 +22,29 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.lir.phases.LIRPhase.Options.LIROptimization; import java.util.ArrayList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInsertionBuffer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.alloc.lsra.Interval.SpillState; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan.IntervalPredicate; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.options.NestedBooleanOptionKey; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.AllocatableValue; @@ -57,7 +54,7 @@ public class LinearScanEliminateSpillMovePhase extends LinearScanAllocationPhase public static class Options { // @formatter:off @Option(help = "Enable spill move elimination.", type = OptionType.Debug) - public static final OptionKey LIROptLSRAEliminateSpillMoves = new NestedBooleanOptionKey(LIROptimization, true); + public static final OptionKey LIROptLSRAEliminateSpillMoves = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true); // @formatter:on } @@ -76,7 +73,7 @@ protected LinearScanEliminateSpillMovePhase(LinearScan allocator) { } @Override - protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { eliminateSpillMoves(lirGenRes); } @@ -118,7 +115,7 @@ void eliminateSpillMoves(LIRGenerationResult res) { int opId = op.id(); if (opId == -1) { - MoveOp move = MoveOp.asMoveOp(op); + StandardOp.MoveOp move = StandardOp.MoveOp.asMoveOp(op); /* * Remove move from register to stack if the stack slot is guaranteed to * be correct. Only moves that have been inserted by LinearScan can be @@ -130,12 +127,12 @@ void eliminateSpillMoves(LIRGenerationResult res) { * instruction. */ if (debug.isLogEnabled()) { - if (ValueMoveOp.isValueMoveOp(op)) { - ValueMoveOp vmove = ValueMoveOp.asValueMoveOp(op); + if (StandardOp.ValueMoveOp.isValueMoveOp(op)) { + StandardOp.ValueMoveOp vmove = StandardOp.ValueMoveOp.asValueMoveOp(op); debug.log("eliminating move from interval %d (%s) to %d (%s) in block %s", allocator.operandNumber(vmove.getInput()), vmove.getInput(), allocator.operandNumber(vmove.getResult()), vmove.getResult(), block); } else { - LoadConstantOp load = LoadConstantOp.asLoadConstantOp(op); + StandardOp.LoadConstantOp load = StandardOp.LoadConstantOp.asLoadConstantOp(op); debug.log("eliminating constant load from %s to %d (%s) in block %s", load.getConstant(), allocator.operandNumber(load.getResult()), load.getResult(), block); } } @@ -168,7 +165,7 @@ void eliminateSpillMoves(LIRGenerationResult res) { assert isRegister(fromLocation) : "from operand must be a register but is: " + fromLocation + " toLocation=" + toLocation + " spillState=" + interval.spillState(); - assert isStackSlotValue(toLocation) : "to operand must be a stack slot"; + assert LIRValueUtil.isStackSlotValue(toLocation) : "to operand must be a stack slot"; LIRInstruction move = allocator.getSpillMoveFactory().createMove(toLocation, fromLocation); insertionBuffer.append(j + 1, move); @@ -198,13 +195,13 @@ assert isRegister(fromLocation) : "from operand must be a register but is: " + f * @param block The block {@code move} is located in. * @param move Spill move. */ - protected boolean canEliminateSpillMove(BasicBlock block, MoveOp move) { - assert isVariable(move.getResult()) : "LinearScan inserts only moves to variables: " + move; + protected boolean canEliminateSpillMove(BasicBlock block, StandardOp.MoveOp move) { + assert LIRValueUtil.isVariable(move.getResult()) : "LinearScan inserts only moves to variables: " + move; Interval curInterval = allocator.intervalFor(move.getResult()); if (!isRegister(curInterval.location()) && curInterval.alwaysInMemory()) { - assert isStackSlotValue(curInterval.location()) : "Not a stack slot: " + curInterval.location(); + assert LIRValueUtil.isStackSlotValue(curInterval.location()) : "Not a stack slot: " + curInterval.location(); return true; } return false; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java index 5224fb9e039f..72dca193e945 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanIntervalDumper.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.isRegister; -import org.graalvm.compiler.lir.alloc.lsra.Interval.UsePosList; -import org.graalvm.compiler.lir.debug.IntervalDumper; +import jdk.compiler.graal.lir.debug.IntervalDumper; +import jdk.compiler.graal.lir.alloc.lsra.Interval.UsePosList; import jdk.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java index d8910fee9ec1..8b951922e2aa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java @@ -22,46 +22,41 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; 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.vm.ci.code.ValueUtil.isStackSlot; -import static org.graalvm.compiler.lir.LIRValueUtil.asVariable; -import static org.graalvm.compiler.lir.LIRValueUtil.isCast; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; -import static org.graalvm.compiler.lir.debug.LIRGenerationDebugContext.getSourceForOperandFromDebugContext; import java.util.ArrayDeque; import java.util.ArrayList; 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 org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.PermanentBailoutException; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.util.BitMap2D; -import org.graalvm.compiler.debug.Assertions; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.InstructionStateProcedure; -import org.graalvm.compiler.lir.InstructionValueConsumer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.StandardOp.LoadConstantOp; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.ValueConsumer; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterPriority; -import org.graalvm.compiler.lir.alloc.lsra.Interval.SpillState; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan.BlockData; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; -import org.graalvm.compiler.lir.util.IndexedValueMap; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterArray; @@ -86,7 +81,7 @@ protected LinearScanLifetimeAnalysisPhase(LinearScan linearScan) { } @Override - protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { numberInstructions(); debug.dump(DebugContext.VERBOSE_LEVEL, lirGenRes.getLIR(), "Before register allocation"); computeLocalLiveSets(); @@ -111,8 +106,8 @@ protected void numberInstructions() { allocator.initIntervals(); ValueConsumer setVariableConsumer = (value, mode, flags) -> { - if (isVariable(value)) { - allocator.getOrCreateInterval(asVariable(value)); + if (LIRValueUtil.isVariable(value)) { + allocator.getOrCreateInterval(LIRValueUtil.asVariable(value)); } }; @@ -187,7 +182,7 @@ void computeLocalLiveSets() { int numInst = instructions.size(); ValueConsumer useConsumer = (operand, mode, flags) -> { - if (isVariable(operand)) { + if (LIRValueUtil.isVariable(operand)) { int operandNum = getOperandNumber(operand); if (!liveKillScratch.get(operandNum)) { liveGenScratch.set(operandNum); @@ -216,7 +211,7 @@ void computeLocalLiveSets() { } }; ValueConsumer defConsumer = (operand, mode, flags) -> { - if (isVariable(operand)) { + if (LIRValueUtil.isVariable(operand)) { int varNum = getOperandNumber(operand); liveKillScratch.set(varNum); if (debug.isLogEnabled()) { @@ -446,7 +441,7 @@ protected void reportFailure(int numBlocks) { Interval interval = allocator.intervalFor(operandNum); if (interval != null) { Value operand = interval.operand; - debug.log("var %d; operand=%s; node=%s", operandNum, operand, getSourceForOperandFromDebugContext(debug, operand)); + debug.log("var %d; operand=%s; node=%s", operandNum, operand, LIRGenerationDebugContext.getSourceForOperandFromDebugContext(debug, operand)); } else { debug.log("var %d; missing operand", operandNum); } @@ -460,7 +455,7 @@ protected void reportFailure(int numBlocks) { Object valueForOperandFromDebugContext = null; if (interval != null) { operand = interval.operand; - valueForOperandFromDebugContext = getSourceForOperandFromDebugContext(debug, operand); + valueForOperandFromDebugContext = LIRGenerationDebugContext.getSourceForOperandFromDebugContext(debug, operand); } try (Indent indent2 = debug.logAndIndent("---- Detailed information for var %d; operand=%s; node=%s ----", operandNum, operand, valueForOperandFromDebugContext)) { @@ -543,7 +538,7 @@ protected void addUse(AllocatableValue operand, int from, int to, RegisterPriori } Interval interval = allocator.getOrCreateInterval(operand); - if (!kind.equals(LIRKind.Illegal) && !isCast(operand)) { + if (!kind.equals(LIRKind.Illegal) && !LIRValueUtil.isCast(operand)) { interval.setKind(kind); } @@ -563,7 +558,7 @@ protected void addTemp(AllocatableValue operand, int tempPos, RegisterPriority r } Interval interval = allocator.getOrCreateInterval(operand); - if (!kind.equals(LIRKind.Illegal) && !isCast(operand)) { + if (!kind.equals(LIRKind.Illegal) && !LIRValueUtil.isCast(operand)) { interval.setKind(kind); } @@ -624,14 +619,14 @@ protected void addDef(AllocatableValue operand, LIRInstruction op, RegisterPrior * of such moves is assigned the stack slot (which is in the caller's frame) as its spill slot. */ protected void handleMethodArguments(LIRInstruction op) { - if (ValueMoveOp.isValueMoveOp(op)) { - ValueMoveOp move = ValueMoveOp.asValueMoveOp(op); + if (StandardOp.ValueMoveOp.isValueMoveOp(op)) { + StandardOp.ValueMoveOp move = StandardOp.ValueMoveOp.asValueMoveOp(op); if (optimizeMethodArgument(move.getInput())) { StackSlot slot = asStackSlot(move.getInput()); if (Assertions.detailedAssertionsEnabled(allocator.getOptions())) { assert op.id() > 0 : "invalid id"; assert allocator.blockForId(op.id()).getPredecessorCount() == 0 : "move from stack must be in first block"; - assert isVariable(move.getResult()) : "result of move must be a variable"; + assert LIRValueUtil.isVariable(move.getResult()) : "result of move must be a variable"; if (debug.isLogEnabled()) { debug.log("found move from stack slot %s to %s", slot, move.getResult()); @@ -645,8 +640,8 @@ protected void handleMethodArguments(LIRInstruction op) { } } - protected void addRegisterHint(final LIRInstruction op, final Value targetValue, OperandMode mode, EnumSet flags, final boolean hintAtDef) { - if (flags.contains(OperandFlag.HINT) && LinearScan.isVariableOrRegister(targetValue)) { + protected void addRegisterHint(final LIRInstruction op, final Value targetValue, LIRInstruction.OperandMode mode, EnumSet flags, final boolean hintAtDef) { + if (flags.contains(LIRInstruction.OperandFlag.HINT) && LinearScan.isVariableOrRegister(targetValue)) { op.forEachRegisterHint(targetValue, mode, (registerHint, valueMode, valueFlags) -> { if (LinearScan.isVariableOrRegister(registerHint)) { @@ -718,8 +713,8 @@ private static boolean optimizeMethodArgument(Value value) { * Determines the register priority for an instruction's output/result operand. */ protected RegisterPriority registerPriorityOfOutputOperand(LIRInstruction op) { - if (ValueMoveOp.isValueMoveOp(op)) { - ValueMoveOp move = ValueMoveOp.asValueMoveOp(op); + if (StandardOp.ValueMoveOp.isValueMoveOp(op)) { + StandardOp.ValueMoveOp move = StandardOp.ValueMoveOp.asValueMoveOp(op); if (optimizeMethodArgument(move.getInput())) { return RegisterPriority.None; } @@ -733,8 +728,8 @@ protected RegisterPriority registerPriorityOfOutputOperand(LIRInstruction op) { * Determines the priority which with an instruction's input operand will be allocated a * register. */ - protected static RegisterPriority registerPriorityOfInputOperand(EnumSet flags) { - if (flags.contains(OperandFlag.STACK)) { + protected static RegisterPriority registerPriorityOfInputOperand(EnumSet flags) { + if (flags.contains(LIRInstruction.OperandFlag.STACK)) { return RegisterPriority.ShouldHaveRegister; } // all other operands require a register @@ -812,7 +807,7 @@ protected void buildIntervals(boolean detailedAsserts) { state.setLiveBasePointers(null); state.visitEachState(op, nonBasePointersStateProc); // visit the base pointers explicitly - liveBasePointers.visitEach(op, OperandMode.ALIVE, null, basePointerStateProc); + liveBasePointers.visitEach(op, LIRInstruction.OperandMode.ALIVE, null, basePointerStateProc); // reset the base pointers state.setLiveBasePointers(liveBasePointers); }; @@ -921,8 +916,8 @@ protected void buildIntervals(boolean detailedAsserts) { * reload-locations in case the interval of this instruction is spilled. */ protected Constant getMaterializedValue(LIRInstruction op, Value operand, Interval interval) { - if (LoadConstantOp.isLoadConstantOp(op)) { - LoadConstantOp move = LoadConstantOp.asLoadConstantOp(op); + if (StandardOp.LoadConstantOp.isLoadConstantOp(op)) { + StandardOp.LoadConstantOp move = StandardOp.LoadConstantOp.asLoadConstantOp(op); if (!allocator.neverSpillConstants()) { /* diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java index dc71828fd236..88bdaf5bfaee 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java @@ -22,23 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; -import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.commonDominator; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; +import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.commonDominator; import java.util.Iterator; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInsertionBuffer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.alloc.lsra.Interval.SpillState; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; +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.vm.ci.code.TargetDescription; import jdk.vm.ci.meta.AllocatableValue; @@ -57,7 +56,7 @@ public final class LinearScanOptimizeSpillPositionPhase extends LinearScanAlloca } @Override - protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { optimizeSpillPosition(lirGenRes); allocator.printIntervals("After optimize spill position"); } @@ -88,7 +87,7 @@ private void optimizeInterval(LIRInsertionBuffer[] insertionBuffers, Interval in Interval firstSpillChild = null; try (Indent indent = debug.logAndIndent("interval %s (%s)", interval, defBlock)) { for (Interval splitChild : interval.getSplitChildren()) { - if (isStackSlotValue(splitChild.location())) { + if (LIRValueUtil.isStackSlotValue(splitChild.location())) { if (firstSpillChild == null || splitChild.from() < firstSpillChild.from()) { firstSpillChild = splitChild; } else { @@ -165,7 +164,7 @@ private void optimizeInterval(LIRInsertionBuffer[] insertionBuffers, Interval in } int spillOpId = allocator.getFirstLirInstructionId(spillBlock); // insert spill move - AllocatableValue fromLocation = interval.getSplitChildAtOpId(spillOpId, OperandMode.DEF, allocator).location(); + AllocatableValue fromLocation = interval.getSplitChildAtOpId(spillOpId, LIRInstruction.OperandMode.DEF, allocator).location(); AllocatableValue toLocation = LinearScan.canonicalSpillOpr(interval); LIRInstruction move = allocator.getSpillMoveFactory().createMove(toLocation, fromLocation); move.setComment(res, "LSRAOptimizeSpillPos: optimize spill pos"); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java index 4b06b6a522e0..bdf513a5026f 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java @@ -22,20 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.lir.alloc.RegisterAllocationPhase; -import org.graalvm.compiler.lir.alloc.lsra.ssa.SSALinearScan; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.MoveFactory; +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.vm.ci.code.TargetDescription; public final class LinearScanPhase extends RegisterAllocationPhase { @Override - protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { MoveFactory spillMoveFactory = context.spillMoveFactory; RegisterAllocationConfig registerAllocationConfig = context.registerAllocationConfig; final LinearScan allocator = new SSALinearScan(target, lirGenRes, spillMoveFactory, registerAllocationConfig, lirGenRes.getLIR().linearScanOrder(), getNeverSpillConstants()); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java index ed686e7e8c28..6beacf7e60a7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; +import jdk.compiler.graal.lir.gen.LIRGenerationResult; +import jdk.compiler.graal.lir.phases.AllocationPhase; import org.graalvm.collections.Pair; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; +import jdk.compiler.graal.debug.Indent; import jdk.vm.ci.code.TargetDescription; @@ -40,7 +40,7 @@ public final class LinearScanRegisterAllocationPhase extends LinearScanAllocatio } @Override - protected void run(TargetDescription target, LIRGenerationResult result, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult result, AllocationPhase.AllocationContext context) { allocator.printIntervals("Before register allocation"); allocateRegisters(); allocator.printIntervals("After register allocation"); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java index 36ca1a094089..e05f55980da2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import java.util.ArrayList; import java.util.BitSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext; +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.vm.ci.code.TargetDescription; @@ -51,7 +51,7 @@ protected LinearScanResolveDataFlowPhase(LinearScan allocator) { } @Override - protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationContext context) { + protected void run(TargetDescription target, LIRGenerationResult lirGenRes, AllocationPhase.AllocationContext context) { resolveDataFlow(); allocator.printIntervals("After resolve data flow"); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java index 374db1f2c9f0..56f8790f773a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/LinearScanWalker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java @@ -22,33 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.CodeUtil.isOdd; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isVariable; import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig.AllocatableRegisters; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.util.Util; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.StandardOp.ValueMoveOp; -import org.graalvm.compiler.lir.alloc.OutOfRegistersException; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterBinding; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterPriority; -import org.graalvm.compiler.lir.alloc.lsra.Interval.SpillState; -import org.graalvm.compiler.lir.alloc.lsra.Interval.State; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; @@ -654,7 +653,7 @@ private void changeSpillState(Interval interval, int spillPos) { * This is called for every interval that is assigned to a stack slot. */ protected void handleSpillSlot(Interval interval) { - assert interval.location() != null && (interval.canMaterialize() || isStackSlotValue(interval.location())) : "interval not assigned to a stack slot " + interval; + assert interval.location() != null && (interval.canMaterialize() || LIRValueUtil.isStackSlotValue(interval.location())) : "interval not assigned to a stack slot " + interval; // Do nothing. Stack slots are not processed in this implementation. } @@ -1012,9 +1011,9 @@ void initVarsForAlloc(Interval interval) { } static boolean isMove(LIRInstruction op, Interval from, Interval to) { - if (ValueMoveOp.isValueMoveOp(op)) { - ValueMoveOp move = ValueMoveOp.asValueMoveOp(op); - if (isVariable(move.getInput()) && isVariable(move.getResult())) { + if (StandardOp.ValueMoveOp.isValueMoveOp(op)) { + StandardOp.ValueMoveOp move = StandardOp.ValueMoveOp.asValueMoveOp(op); + if (LIRValueUtil.isVariable(move.getInput()) && LIRValueUtil.isVariable(move.getResult())) { return move.getInput() != null && move.getInput().equals(from.operand) && move.getResult() != null && move.getResult().equals(to.operand); } } @@ -1089,7 +1088,7 @@ protected boolean activateCurrent(Interval interval) { try (Indent indent = debug.logAndIndent("activating interval %s, splitParent: %d", interval, interval.splitParent().operandNumber)) { final Value operand = interval.operand; - if (interval.location() != null && isStackSlotValue(interval.location())) { + if (interval.location() != null && LIRValueUtil.isStackSlotValue(interval.location())) { // activating an interval that has a stack slot assigned . split it at first use // position // used for method parameters diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java index a5eec0bea063..99bbd3d86758 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/MoveResolver.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.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 org.graalvm.collections.EconomicSet; import org.graalvm.collections.Equivalence; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInsertionBuffer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; +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.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Constant; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java index da02aff30e42..d04499e5418d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/OptimizingLinearScanWalker.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java @@ -22,21 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; - -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterBinding; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterPriority; -import org.graalvm.compiler.lir.alloc.lsra.Interval.State; -import org.graalvm.compiler.options.Option; -import org.graalvm.compiler.options.OptionKey; -import org.graalvm.compiler.options.OptionType; + +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.vm.ci.code.Register; import jdk.vm.ci.meta.AllocatableValue; @@ -61,10 +61,10 @@ public static class Options { protected void handleSpillSlot(Interval interval) { assert interval.location() != null : "interval not assigned " + interval; if (interval.canMaterialize()) { - assert !isStackSlotValue(interval.location()) : "interval can materialize but assigned to a stack slot " + interval; + assert !LIRValueUtil.isStackSlotValue(interval.location()) : "interval can materialize but assigned to a stack slot " + interval; return; } - assert isStackSlotValue(interval.location()) : "interval not assigned to a stack slot " + interval; + assert LIRValueUtil.isStackSlotValue(interval.location()) : "interval not assigned to a stack slot " + interval; DebugContext debug = allocator.getDebug(); try (DebugContext.Scope s1 = debug.scope("LSRAOptimization")) { debug.log("adding stack to unhandled list %s", interval); @@ -159,13 +159,13 @@ private boolean optimize(int currentPos, BasicBlock currentBlock, Interval cu return false; } - if (!isStackSlotValue(predecessorLocation) && !isRegister(predecessorLocation)) { + if (!LIRValueUtil.isStackSlotValue(predecessorLocation) && !isRegister(predecessorLocation)) { assert predecessorInterval.canMaterialize(); // value is materialized -> no need for optimization return false; } - assert isStackSlotValue(currentLocation) || isRegister(currentLocation) : "current location not a register or stack slot " + currentLocation; + assert LIRValueUtil.isStackSlotValue(currentLocation) || isRegister(currentLocation) : "current location not a register or stack slot " + currentLocation; DebugContext debug = allocator.getDebug(); try (Indent indent = debug.logAndIndent("location differs: %s vs. %s", predecessorLocation, currentLocation)) { @@ -195,7 +195,7 @@ private boolean optimize(int currentPos, BasicBlock currentBlock, Interval cu if (isRegister(predecessorLocation)) { splitRegisterInterval(splitPart, asRegister(predecessorLocation)); } else { - assert isStackSlotValue(predecessorLocation); + assert LIRValueUtil.isStackSlotValue(predecessorLocation); debug.log("assigning interval %s to %s", splitPart, predecessorLocation); splitPart.assignLocation(predecessorLocation); // activate interval diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/Range.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Range.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/Range.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Range.java index 5336fcf95200..e70e9439f610 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/Range.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Range.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; -import org.graalvm.compiler.core.common.util.CompilationAlarm; -import org.graalvm.compiler.lir.LIR; +import jdk.compiler.graal.core.common.util.CompilationAlarm; +import jdk.compiler.graal.lir.LIR; /** * Represents a range of integers from a start (inclusive) to an end (exclusive. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java index d3d9ed743568..2cf4c2ec4415 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/RegisterVerifier.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.alloc.lsra; +package jdk.compiler.graal.lir.alloc.lsra; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; @@ -30,15 +30,13 @@ import java.util.ArrayList; import java.util.EnumSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.core.common.cfg.BlockMap; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.InstructionValueConsumer; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; @@ -219,7 +217,7 @@ void processOperations(BasicBlock block, final Interval[] inputState) { InstructionValueConsumer useConsumer = new InstructionValueConsumer() { @Override - public void visitValue(LIRInstruction op, Value operand, OperandMode mode, EnumSet flags) { + public void visitValue(LIRInstruction op, Value operand, LIRInstruction.OperandMode mode, EnumSet flags) { // we skip spill moves inserted by the spill position optimization if (LinearScan.isVariableOrRegister(operand) && allocator.isProcessed(operand) && op.id() != LinearScan.DOMINATOR_SPILL_MOVE_ID) { Interval interval = intervalAt(operand); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java index 672194f1521c..4a1a4d9ff76e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScan.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.lir.alloc.lsra.ssa; +package jdk.compiler.graal.lir.alloc.lsra.ssa; -import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan; -import org.graalvm.compiler.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; -import org.graalvm.compiler.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; -import org.graalvm.compiler.lir.alloc.lsra.LinearScanResolveDataFlowPhase; -import org.graalvm.compiler.lir.alloc.lsra.MoveResolver; -import org.graalvm.compiler.lir.gen.LIRGenerationResult; -import org.graalvm.compiler.lir.gen.MoveFactory; -import org.graalvm.compiler.lir.ssa.SSAUtil; +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.vm.ci.code.TargetDescription; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java index 1b84c24d3149..74a2d14ed31b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.lir.alloc.lsra.ssa; +package jdk.compiler.graal.lir.alloc.lsra.ssa; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; +import static jdk.compiler.graal.lir.LIRValueUtil.isStackSlotValue; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.debug.Indent; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.StandardOp.LabelOp; -import org.graalvm.compiler.lir.StandardOp.MoveOp; -import org.graalvm.compiler.lir.alloc.lsra.Interval; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan; -import org.graalvm.compiler.lir.alloc.lsra.LinearScanEliminateSpillMovePhase; +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; public class SSALinearScanEliminateSpillMovePhase extends LinearScanEliminateSpillMovePhase { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java index bc9574abcb46..09c95df64c55 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.lir.alloc.lsra.ssa; +package jdk.compiler.graal.lir.alloc.lsra.ssa; import java.util.BitSet; import java.util.EnumSet; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.LIR; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.StandardOp.LabelOp; -import org.graalvm.compiler.lir.alloc.lsra.Interval; -import org.graalvm.compiler.lir.alloc.lsra.Interval.RegisterPriority; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan; -import org.graalvm.compiler.lir.alloc.lsra.LinearScanLifetimeAnalysisPhase; -import org.graalvm.compiler.lir.ssa.SSAUtil; +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.vm.ci.meta.AllocatableValue; import jdk.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java index a1d3dc2cdab0..8d4b15622584 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.lir.alloc.lsra.ssa; +package jdk.compiler.graal.lir.alloc.lsra.ssa; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRValueUtil.asConstant; -import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; +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 java.util.ArrayList; -import org.graalvm.compiler.core.common.cfg.BasicBlock; -import org.graalvm.compiler.debug.CounterKey; -import org.graalvm.compiler.debug.DebugContext; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.alloc.lsra.Interval; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan; -import org.graalvm.compiler.lir.alloc.lsra.LinearScanResolveDataFlowPhase; -import org.graalvm.compiler.lir.alloc.lsra.MoveResolver; -import org.graalvm.compiler.lir.ssa.SSAUtil; -import org.graalvm.compiler.lir.ssa.SSAUtil.PhiValueVisitor; +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.vm.ci.meta.Value; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java index c020e29df99a..42b174f531e7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/alloc/lsra/ssa/SSAMoveResolver.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.lir.alloc.lsra.ssa; +package jdk.compiler.graal.lir.alloc.lsra.ssa; -import static org.graalvm.compiler.lir.LIRValueUtil.asVirtualStackSlot; -import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue; -import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot; +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.vm.ci.code.ValueUtil.asStackSlot; import static jdk.vm.ci.code.ValueUtil.isStackSlot; import java.util.Arrays; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.VirtualStackSlot; -import org.graalvm.compiler.lir.alloc.lsra.Interval; -import org.graalvm.compiler.lir.alloc.lsra.LinearScan; -import org.graalvm.compiler.lir.alloc.lsra.MoveResolver; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.framemap.FrameMapBuilderTool; +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.vm.ci.code.StackSlot; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AESDecryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java similarity index 67% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AESDecryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java index 99de5bffb9f9..7aa96b61bf9c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AESDecryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java @@ -22,24 +22,21 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -55,19 +52,19 @@ public final class AMD64AESDecryptOp extends AMD64LIRInstruction { private final int lengthOffset; - @Alive({REG}) private Value fromValue; - @Alive({REG}) private Value toValue; - @Alive({REG}) private Value keyValue; + @Alive({OperandFlag.REG}) private Value fromValue; + @Alive({OperandFlag.REG}) private Value toValue; + @Alive({OperandFlag.REG}) private Value keyValue; - @Temp({REG}) private Value keyLenValue; + @Temp({OperandFlag.REG}) private Value keyLenValue; - @Temp({REG}) private Value xmmResultValue; - @Temp({REG}) private Value xmmKeyShufMaskValue; + @Temp({OperandFlag.REG}) private Value xmmResultValue; + @Temp({OperandFlag.REG}) private Value xmmKeyShufMaskValue; - @Temp({REG}) private Value xmmTempValue1; - @Temp({REG}) private Value xmmTempValue2; - @Temp({REG}) private Value xmmTempValue3; - @Temp({REG}) private Value xmmTempValue4; + @Temp({OperandFlag.REG}) private Value xmmTempValue1; + @Temp({OperandFlag.REG}) private Value xmmTempValue2; + @Temp({OperandFlag.REG}) private Value xmmTempValue3; + @Temp({OperandFlag.REG}) private Value xmmTempValue4; public AMD64AESDecryptOp(LIRGeneratorTool tool, Value fromValue, Value toValue, Value keyValue, int lengthOffset) { super(TYPE); @@ -111,51 +108,51 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { // keylen could be only {11, 13, 15} * 4 = {44, 52, 60} masm.movl(keylen, new AMD64Address(key, lengthOffset)); - masm.movdqu(xmmKeyShufMask, recordExternalAddress(crb, keyShuffleMask)); + masm.movdqu(xmmKeyShufMask, recordExternalAddress(crb, AMD64AESEncryptOp.keyShuffleMask)); masm.movdqu(xmmResult, new AMD64Address(from, 0)); // for decryption java expanded key ordering is rotated one position from what we want // so we start from 0x10 here and hit 0x00 last // we don't know if the key is aligned, hence not using load-execute form - loadKey(masm, xmmTemp1, key, 0x10, xmmKeyShufMask); - loadKey(masm, xmmTemp2, key, 0x20, xmmKeyShufMask); - loadKey(masm, xmmTemp3, key, 0x30, xmmKeyShufMask); - loadKey(masm, xmmTemp4, key, 0x40, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp1, key, 0x10, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp2, key, 0x20, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp3, key, 0x30, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp4, key, 0x40, xmmKeyShufMask); masm.pxor(xmmResult, xmmTemp1); masm.aesdec(xmmResult, xmmTemp2); masm.aesdec(xmmResult, xmmTemp3); masm.aesdec(xmmResult, xmmTemp4); - loadKey(masm, xmmTemp1, key, 0x50, xmmKeyShufMask); - loadKey(masm, xmmTemp2, key, 0x60, xmmKeyShufMask); - loadKey(masm, xmmTemp3, key, 0x70, xmmKeyShufMask); - loadKey(masm, xmmTemp4, key, 0x80, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp1, key, 0x50, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp2, key, 0x60, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp3, key, 0x70, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp4, key, 0x80, xmmKeyShufMask); masm.aesdec(xmmResult, xmmTemp1); masm.aesdec(xmmResult, xmmTemp2); masm.aesdec(xmmResult, xmmTemp3); masm.aesdec(xmmResult, xmmTemp4); - loadKey(masm, xmmTemp1, key, 0x90, xmmKeyShufMask); - loadKey(masm, xmmTemp2, key, 0xa0, xmmKeyShufMask); - loadKey(masm, xmmTemp3, key, 0x00, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp1, key, 0x90, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp2, key, 0xa0, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp3, key, 0x00, xmmKeyShufMask); masm.cmplAndJcc(keylen, 44, ConditionFlag.Equal, labelDoLast, true); masm.aesdec(xmmResult, xmmTemp1); masm.aesdec(xmmResult, xmmTemp2); - loadKey(masm, xmmTemp1, key, 0xb0, xmmKeyShufMask); - loadKey(masm, xmmTemp2, key, 0xc0, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp1, key, 0xb0, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp2, key, 0xc0, xmmKeyShufMask); masm.cmplAndJcc(keylen, 52, ConditionFlag.Equal, labelDoLast, true); masm.aesdec(xmmResult, xmmTemp1); masm.aesdec(xmmResult, xmmTemp2); - loadKey(masm, xmmTemp1, key, 0xd0, xmmKeyShufMask); - loadKey(masm, xmmTemp2, key, 0xe0, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp1, key, 0xd0, xmmKeyShufMask); + AMD64AESEncryptOp.loadKey(masm, xmmTemp2, key, 0xe0, xmmKeyShufMask); masm.bind(labelDoLast); masm.aesdec(xmmResult, xmmTemp1); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AESEncryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AESEncryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java index 0850126650eb..e6fc7edda324 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AESEncryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java @@ -22,25 +22,24 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -60,19 +59,19 @@ public final class AMD64AESEncryptOp extends AMD64LIRInstruction { private final int lengthOffset; - @Alive({REG}) private Value fromValue; - @Alive({REG}) private Value toValue; - @Alive({REG}) private Value keyValue; + @Alive({OperandFlag.REG}) private Value fromValue; + @Alive({OperandFlag.REG}) private Value toValue; + @Alive({OperandFlag.REG}) private Value keyValue; - @Temp({REG}) private Value keyLenValue; + @Temp({OperandFlag.REG}) private Value keyLenValue; - @Temp({REG}) private Value xmmResultValue; - @Temp({REG}) private Value xmmKeyShufMaskValue; + @Temp({OperandFlag.REG}) private Value xmmResultValue; + @Temp({OperandFlag.REG}) private Value xmmKeyShufMaskValue; - @Temp({REG}) private Value xmmTempValue1; - @Temp({REG}) private Value xmmTempValue2; - @Temp({REG}) private Value xmmTempValue3; - @Temp({REG}) private Value xmmTempValue4; + @Temp({OperandFlag.REG}) private Value xmmTempValue1; + @Temp({OperandFlag.REG}) private Value xmmTempValue2; + @Temp({OperandFlag.REG}) private Value xmmTempValue3; + @Temp({OperandFlag.REG}) private Value xmmTempValue4; public AMD64AESEncryptOp(LIRGeneratorTool tool, AllocatableValue fromValue, AllocatableValue toValue, AllocatableValue keyValue, int lengthOffset) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java index f5831f37b7cc..ab7266da32a8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64AddressValue.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java @@ -22,21 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.isLegal; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.EnumSet; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.lir.CompositeValue; -import org.graalvm.compiler.lir.InstructionValueConsumer; -import org.graalvm.compiler.lir.InstructionValueProcedure; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstruction.OperandFlag; -import org.graalvm.compiler.lir.LIRInstruction.OperandMode; +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.vm.ci.code.Register; import jdk.vm.ci.code.RegisterValue; @@ -46,13 +43,13 @@ public final class AMD64AddressValue extends CompositeValue { - @Component({REG, OperandFlag.ILLEGAL}) protected AllocatableValue base; - @Component({REG, OperandFlag.ILLEGAL}) protected AllocatableValue index; + @Component({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected AllocatableValue base; + @Component({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected AllocatableValue index; protected final Stride stride; protected final int displacement; private final Object displacementAnnotation; - private static final EnumSet flags = EnumSet.of(OperandFlag.REG, OperandFlag.ILLEGAL); + private static final EnumSet flags = EnumSet.of(LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL); public AMD64AddressValue(ValueKind kind, AllocatableValue base, int displacement) { this(kind, base, Value.ILLEGAL, Stride.S1, displacement); @@ -82,7 +79,7 @@ public AllocatableValue getIndex() { } @Override - public CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueProcedure proc) { + public CompositeValue forEachComponent(LIRInstruction inst, LIRInstruction.OperandMode mode, InstructionValueProcedure proc) { AllocatableValue newBase = (AllocatableValue) proc.doValue(inst, base, mode, flags); AllocatableValue newIndex = (AllocatableValue) proc.doValue(inst, index, mode, flags); if (!base.identityEquals(newBase) || !index.identityEquals(newIndex)) { @@ -92,7 +89,7 @@ public CompositeValue forEachComponent(LIRInstruction inst, OperandMode mode, In } @Override - protected void visitEachComponent(LIRInstruction inst, OperandMode mode, InstructionValueConsumer proc) { + protected void visitEachComponent(LIRInstruction inst, LIRInstruction.OperandMode mode, InstructionValueConsumer proc) { proc.visitValue(inst, base, mode, flags); proc.visitValue(inst, index, mode, flags); } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java index b5544f0f470f..a92124f529ff 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Arithmetic.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java @@ -22,18 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java index 4d931975c104..cffe7cd204b2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java @@ -22,9 +22,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool; +import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool; import jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.meta.AllocatableValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayCompareToOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayCompareToOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java index 0735624c8eb0..db7e8e853fab 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayCompareToOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java @@ -22,29 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.k7; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rcx; import static jdk.vm.ci.amd64.AMD64.rdx; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; @@ -64,18 +62,18 @@ public final class AMD64ArrayCompareToOp extends AMD64ComplexVectorOp { private final Stride strideB; private final int useAVX3Threshold; - @Def({REG}) protected Value resultValue; - @Alive({REG}) protected Value arrayAValue; - @Alive({REG}) protected Value arrayBValue; - @Use({REG}) protected Value lengthAValue; - @Use({REG}) protected Value lengthBValue; - @Temp({REG}) protected Value lengthAValueTemp; - @Temp({REG}) protected Value lengthBValueTemp; - @Temp({REG}) protected Value temp1; - @Temp({REG}) protected Value temp2; - - @Temp({REG, ILLEGAL}) protected Value vectorTemp1; - @Temp({REG, ILLEGAL}) protected Value maskRegister; + @Def({OperandFlag.REG}) protected Value resultValue; + @Alive({OperandFlag.REG}) protected Value arrayAValue; + @Alive({OperandFlag.REG}) protected Value arrayBValue; + @Use({OperandFlag.REG}) protected Value lengthAValue; + @Use({OperandFlag.REG}) protected Value lengthBValue; + @Temp({OperandFlag.REG}) protected Value lengthAValueTemp; + @Temp({OperandFlag.REG}) protected Value lengthBValueTemp; + @Temp({OperandFlag.REG}) protected Value temp1; + @Temp({OperandFlag.REG}) protected Value temp2; + + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) protected Value vectorTemp1; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) protected Value maskRegister; public AMD64ArrayCompareToOp(LIRGeneratorTool tool, int useAVX3Threshold, Stride strideA, Stride strideB, EnumSet runtimeCheckedCPUFeatures, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayCopyWithConversionsOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayCopyWithConversionsOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java index e3772cb51667..ed56bb0a666a 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayCopyWithConversionsOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.rax; @@ -32,29 +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 org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.XMM; +import static jdk.compiler.graal.asm.amd64.AVXKind.AVXSize.YMM; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.StrideUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.code.Register; @@ -96,21 +94,21 @@ private enum Op { private final Stride strideDstConst; private final AMD64MacroAssembler.ExtendMode extendMode; - @Use({REG}) private Value arraySrc; - @Use({REG}) private Value offsetSrc; - @Use({REG}) private Value arrayDst; - @Use({REG}) private Value offsetDst; - @Use({REG}) private Value length; - @Use({REG, ILLEGAL}) private Value dynamicStrides; - - @Temp({REG}) private Value arraySrcTmp; - @Temp({REG}) private Value offsetSrcTmp; - @Temp({REG}) private Value arrayDstTmp; - @Temp({REG}) private Value offsetDstTmp; - @Temp({REG}) private Value lengthTmp; - @Temp({REG, ILLEGAL}) private Value dynamicStridesTmp; - - @Temp({REG}) private Value[] vectorTemp; + @Use({OperandFlag.REG}) private Value arraySrc; + @Use({OperandFlag.REG}) private Value offsetSrc; + @Use({OperandFlag.REG}) private Value arrayDst; + @Use({OperandFlag.REG}) private Value offsetDst; + @Use({OperandFlag.REG}) private Value length; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value dynamicStrides; + + @Temp({OperandFlag.REG}) private Value arraySrcTmp; + @Temp({OperandFlag.REG}) private Value offsetSrcTmp; + @Temp({OperandFlag.REG}) private Value arrayDstTmp; + @Temp({OperandFlag.REG}) private Value offsetDstTmp; + @Temp({OperandFlag.REG}) private Value lengthTmp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value dynamicStridesTmp; + + @Temp({OperandFlag.REG}) private Value[] vectorTemp; /** * Arraycopy operation for arbitrary source and destination arrays, with arbitrary byte offset, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java similarity index 94% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java index 0cd0bc82a75f..70bd1c088e84 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayEqualsOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.r9; @@ -33,31 +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 org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.OR; +import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.SSEOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.StrideUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LIRValueUtil; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; @@ -94,26 +92,26 @@ public final class AMD64ArrayEqualsOp extends AMD64ComplexVectorOp { private final AMD64MacroAssembler.ExtendMode extendMode; private final boolean canGenerateConstantLengthCompare; - @Def({REG}) private Value resultValue; - @Use({REG}) private Value arrayAValue; - @Use({REG, ILLEGAL}) private Value offsetAValue; - @Use({REG}) private Value arrayBValue; - @Use({REG, ILLEGAL}) private Value offsetBValue; - @Use({REG, ILLEGAL}) private Value arrayMaskValue; - @Use({REG}) private Value lengthValue; - @Use({REG, ILLEGAL}) private Value dynamicStridesValue; - - @Temp({REG}) private Value arrayAValueTemp; - @Temp({REG, ILLEGAL}) private Value offsetAValueTemp; - @Temp({REG}) private Value arrayBValueTemp; - @Temp({REG, ILLEGAL}) private Value offsetBValueTemp; - @Temp({REG, ILLEGAL}) private Value arrayMaskValueTemp; - @Temp({REG}) private Value lengthValueTemp; - @Temp({REG, ILLEGAL}) private Value dynamicStrideValueTemp; - - @Temp({REG, ILLEGAL}) private Value tempXMM; - - @Temp({REG}) private Value[] vectorTemp; + @Def({OperandFlag.REG}) private Value resultValue; + @Use({OperandFlag.REG}) private Value arrayAValue; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value offsetAValue; + @Use({OperandFlag.REG}) private Value arrayBValue; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value offsetBValue; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value arrayMaskValue; + @Use({OperandFlag.REG}) private Value lengthValue; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value dynamicStridesValue; + + @Temp({OperandFlag.REG}) private Value arrayAValueTemp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value offsetAValueTemp; + @Temp({OperandFlag.REG}) private Value arrayBValueTemp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value offsetBValueTemp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value arrayMaskValueTemp; + @Temp({OperandFlag.REG}) private Value lengthValueTemp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value dynamicStrideValueTemp; + + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value tempXMM; + + @Temp({OperandFlag.REG}) private Value[] vectorTemp; private AMD64ArrayEqualsOp(LIRGeneratorTool tool, JavaKind elementKind, Stride strideA, Stride strideB, Stride strideMask, EnumSet runtimeCheckedCPUFeatures, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayIndexOfOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayIndexOfOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java index e78235cebf3c..9496fe568152 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayIndexOfOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.rax; @@ -33,32 +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 org.graalvm.compiler.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +import static jdk.compiler.graal.asm.amd64.AMD64MacroAssembler.ExtendMode.ZERO_EXTEND; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.ConstantValue; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; @@ -82,45 +78,45 @@ public final class AMD64ArrayIndexOfOp extends AMD64ComplexVectorOp { private final Stride stride; private final int nValues; - private final ArrayIndexOfVariant variant; + private final LIRGeneratorTool.ArrayIndexOfVariant variant; private final boolean findTwoConsecutive; private final boolean withMask; private final AMD64Kind vectorKind; private final Stride arrayIndexStride; private final int constOffset; - @Def({REG}) Value resultValue; + @Def({OperandFlag.REG}) Value resultValue; - @Use({REG}) Value arrayReg; - @Use({REG}) Value offsetReg; - @Use({REG}) Value lengthReg; - @Use({REG}) Value fromIndexReg; - @Use({REG}) Value searchValue1; - @Use({REG, ILLEGAL}) Value searchValue2; + @Use({OperandFlag.REG}) Value arrayReg; + @Use({OperandFlag.REG}) Value offsetReg; + @Use({OperandFlag.REG}) Value lengthReg; + @Use({OperandFlag.REG}) Value fromIndexReg; + @Use({OperandFlag.REG}) Value searchValue1; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) Value searchValue2; - @Temp({REG}) Value arrayTmp; - @Temp({REG}) Value offsetTmp; - @Temp({REG}) Value lengthTmp; - @Temp({REG}) Value fromIndexTmp; - @Temp({REG}) Value searchValue1Tmp; - @Temp({REG, ILLEGAL}) Value searchValue2Tmp; + @Temp({OperandFlag.REG}) Value arrayTmp; + @Temp({OperandFlag.REG}) Value offsetTmp; + @Temp({OperandFlag.REG}) Value lengthTmp; + @Temp({OperandFlag.REG}) Value fromIndexTmp; + @Temp({OperandFlag.REG}) Value searchValue1Tmp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) Value searchValue2Tmp; - @Alive({REG, STACK, ILLEGAL}) Value searchValue3; - @Alive({REG, STACK, ILLEGAL}) Value searchValue4; + @Alive({OperandFlag.REG, OperandFlag.STACK, OperandFlag.ILLEGAL}) Value searchValue3; + @Alive({OperandFlag.REG, OperandFlag.STACK, OperandFlag.ILLEGAL}) Value searchValue4; - @Temp({REG}) Value[] vectorCompareVal; - @Temp({REG}) Value[] vectorArray; - @Temp({REG}) Value[] vectorTemp; + @Temp({OperandFlag.REG}) Value[] vectorCompareVal; + @Temp({OperandFlag.REG}) Value[] vectorArray; + @Temp({OperandFlag.REG}) Value[] vectorTemp; - private AMD64ArrayIndexOfOp(Stride stride, ArrayIndexOfVariant variant, int constOffset, int nValues, LIRGeneratorTool tool, + private AMD64ArrayIndexOfOp(Stride stride, LIRGeneratorTool.ArrayIndexOfVariant variant, int constOffset, int nValues, LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures, Value result, Value arrayPtr, Value arrayOffset, Value arrayLength, Value fromIndex, Value searchValue1, Value searchValue2, Value searchValue3, Value searchValue4) { super(TYPE, tool, runtimeCheckedCPUFeatures, AVXSize.YMM); this.stride = stride; this.arrayIndexStride = stride; this.variant = variant; - this.findTwoConsecutive = variant == ArrayIndexOfVariant.FindTwoConsecutive || variant == ArrayIndexOfVariant.FindTwoConsecutiveWithMask; - this.withMask = variant == ArrayIndexOfVariant.WithMask || variant == ArrayIndexOfVariant.FindTwoConsecutiveWithMask; + this.findTwoConsecutive = variant == LIRGeneratorTool.ArrayIndexOfVariant.FindTwoConsecutive || variant == LIRGeneratorTool.ArrayIndexOfVariant.FindTwoConsecutiveWithMask; + this.withMask = variant == LIRGeneratorTool.ArrayIndexOfVariant.WithMask || variant == LIRGeneratorTool.ArrayIndexOfVariant.FindTwoConsecutiveWithMask; this.constOffset = constOffset; this.nValues = nValues; GraalError.guarantee(supports(tool.target(), runtimeCheckedCPUFeatures, CPUFeature.SSE2), "needs at least SSE2 support"); @@ -131,7 +127,7 @@ private AMD64ArrayIndexOfOp(Stride stride, ArrayIndexOfVariant variant, int cons this.lengthTmp = this.lengthReg = arrayLength; this.fromIndexTmp = this.fromIndexReg = fromIndex; this.searchValue1Tmp = this.searchValue1 = searchValue1; - if (variant == ArrayIndexOfVariant.Table) { + if (variant == LIRGeneratorTool.ArrayIndexOfVariant.Table) { this.searchValue2Tmp = searchValue2; this.searchValue2 = Value.ILLEGAL; } else { @@ -141,12 +137,12 @@ private AMD64ArrayIndexOfOp(Stride stride, ArrayIndexOfVariant variant, int cons this.searchValue4 = searchValue4; this.vectorKind = getVectorKind(stride); - this.vectorCompareVal = allocateVectorRegisters(tool, stride, variant == ArrayIndexOfVariant.Table ? 2 : nValues); - this.vectorArray = allocateVectorRegisters(tool, stride, variant == ArrayIndexOfVariant.Table ? stride.value : 4); + this.vectorCompareVal = allocateVectorRegisters(tool, stride, variant == LIRGeneratorTool.ArrayIndexOfVariant.Table ? 2 : nValues); + this.vectorArray = allocateVectorRegisters(tool, stride, variant == LIRGeneratorTool.ArrayIndexOfVariant.Table ? stride.value : 4); this.vectorTemp = allocateVectorRegisters(tool, stride, getNumberOfRequiredTempVectors(variant, nValues)); } - private static int getNumberOfRequiredTempVectors(ArrayIndexOfVariant variant, int nValues) { + private static int getNumberOfRequiredTempVectors(LIRGeneratorTool.ArrayIndexOfVariant variant, int nValues) { switch (variant) { case MatchRange: return nValues / 2 + 1; @@ -165,7 +161,7 @@ private static Register[] asRegisters(Value[] values) { return registers; } - public static AMD64ArrayIndexOfOp movParamsAndCreate(Stride stride, ArrayIndexOfVariant variant, LIRGeneratorTool tool, + public static AMD64ArrayIndexOfOp movParamsAndCreate(Stride stride, LIRGeneratorTool.ArrayIndexOfVariant variant, LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures, Value result, Value arrayPtr, Value arrayOffset, Value arrayLength, Value fromIndex, Value... searchValues) { int nValues = searchValues.length; @@ -174,7 +170,8 @@ public static AMD64ArrayIndexOfOp movParamsAndCreate(Stride stride, ArrayIndexOf RegisterValue regLength = REG_LENGTH.asValue(arrayLength.getValueKind()); RegisterValue regFromIndex = REG_FROM_INDEX.asValue(fromIndex.getValueKind()); RegisterValue regSearchValue1 = REG_SEARCH_VALUE_1.asValue(searchValues[0].getValueKind()); - Value regSearchValue2 = nValues > 1 ? REG_SEARCH_VALUE_2.asValue(searchValues[1].getValueKind()) : variant == ArrayIndexOfVariant.Table ? REG_SEARCH_VALUE_2.asValue() : Value.ILLEGAL; + Value regSearchValue2 = nValues > 1 ? REG_SEARCH_VALUE_2.asValue(searchValues[1].getValueKind()) + : variant == LIRGeneratorTool.ArrayIndexOfVariant.Table ? REG_SEARCH_VALUE_2.asValue() : Value.ILLEGAL; Value regSearchValue3 = nValues > 2 ? tool.asAllocatable(searchValues[2]) : Value.ILLEGAL; Value regSearchValue4 = nValues > 3 ? tool.asAllocatable(searchValues[3]) : Value.ILLEGAL; @@ -232,7 +229,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { Label elementWiseNotFound = new Label(); Label skipBulkVectorLoop = new Label(); Label bsfAdd = new Label(); - int vectorLength = variant == ArrayIndexOfVariant.Table ? vectorKind.getSizeInBytes() : vectorKind.getVectorLength(); + int vectorLength = variant == LIRGeneratorTool.ArrayIndexOfVariant.Table ? vectorKind.getSizeInBytes() : vectorKind.getVectorLength(); int bulkSize = vectorLength * nVectors; if (useConstantOffset()) { @@ -247,7 +244,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { // re-use fromIndex register as temp Register cmpResult = asRegister(fromIndexReg); - if (variant == ArrayIndexOfVariant.Table) { + if (variant == LIRGeneratorTool.ArrayIndexOfVariant.Table) { // load lookup tables asm.movdqu(AVXSize.XMM, vecCmp[0], new AMD64Address(asRegister(searchValue[0]))); asm.movdqu(AVXSize.XMM, vecCmp[1], new AMD64Address(asRegister(searchValue[0]), AVXSize.XMM.getBytes())); @@ -279,9 +276,9 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { // index = fromIndex (+ 1 if findTwoConsecutive) + XMM vector size asm.subq(index, vectorLength / 2); // check if vector load is in bounds - asm.cmpqAndJcc(index, arrayLength, ConditionFlag.Greater, variant == ArrayIndexOfVariant.Table ? elementWise : qWordWise, false); + asm.cmpqAndJcc(index, arrayLength, ConditionFlag.Greater, variant == LIRGeneratorTool.ArrayIndexOfVariant.Table ? elementWise : qWordWise, false); // do one vector comparison from fromIndex - emitVectorCompare(asm, AVXSize.XMM, 1, arrayPtr, index, vecCmp, vecArray, vecTmp, cmpResult, xmmFound, variant != ArrayIndexOfVariant.Table); + emitVectorCompare(asm, AVXSize.XMM, 1, arrayPtr, index, vecCmp, vecArray, vecTmp, cmpResult, xmmFound, variant != LIRGeneratorTool.ArrayIndexOfVariant.Table); // and one aligned to the array end asm.movq(index, arrayLength); emitVectorCompare(asm, AVXSize.XMM, 1, arrayPtr, index, vecCmp, vecArray, vecTmp, cmpResult, xmmFound, true); @@ -295,7 +292,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { } int vectorLengthQWord = AVXSize.QWORD.getBytes() / stride.value; - if (variant != ArrayIndexOfVariant.Table) { + if (variant != LIRGeneratorTool.ArrayIndexOfVariant.Table) { asm.bind(qWordWise); // region is too short for XMM vectors, try QWORD Label[] qWordFound = {new Label()}; @@ -320,7 +317,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { // search range is smaller than vector size, do element-wise comparison asm.bind(elementWise); // index = fromIndex (+ 1 if findTwoConsecutive) - asm.subq(index, (variant == ArrayIndexOfVariant.Table) ? (supportsAVX2AndYMM() ? (vectorLength / 2) : vectorLength) : vectorLengthQWord); + asm.subq(index, (variant == LIRGeneratorTool.ArrayIndexOfVariant.Table) ? (supportsAVX2AndYMM() ? (vectorLength / 2) : vectorLength) : vectorLengthQWord); // check if enough array slots remain asm.cmpqAndJcc(index, arrayLength, ConditionFlag.GreaterEqual, elementWiseNotFound, true); @@ -432,7 +429,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { // add bulk size asm.addq(index, bulkSize); - boolean bulkLoopShortJmp = !((variant == ArrayIndexOfVariant.MatchRange && nValues == 4 || variant == ArrayIndexOfVariant.Table) && stride.value > 1); + boolean bulkLoopShortJmp = !((variant == LIRGeneratorTool.ArrayIndexOfVariant.MatchRange && nValues == 4 || variant == LIRGeneratorTool.ArrayIndexOfVariant.Table) && stride.value > 1); // check if there are enough array slots remaining for the bulk loop asm.cmpqAndJcc(index, arrayLength, ConditionFlag.Greater, skipBulkVectorLoop, bulkLoopShortJmp); @@ -480,7 +477,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { } } asm.bind(bsfAdd); - if (variant == ArrayIndexOfVariant.Table) { + if (variant == LIRGeneratorTool.ArrayIndexOfVariant.Table) { asm.pxor(vectorSize, vecTmp[1], vecTmp[1]); asm.pcmpeqb(vectorSize, vecTmp[2], vecTmp[1]); asm.pmovmsk(vectorSize, cmpResult, vecTmp[2]); @@ -488,7 +485,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler asm) { } // find offset bsfq(asm, cmpResult, cmpResult); - if (stride.value > 1 && variant != ArrayIndexOfVariant.Table) { + if (stride.value > 1 && variant != LIRGeneratorTool.ArrayIndexOfVariant.Table) { // convert byte offset to chars asm.shrq(cmpResult, stride.log2); } @@ -527,7 +524,7 @@ private boolean searchValuesOnStack(Value[] searchValue) { } private int getResultIndexDelta(int i) { - if (variant == ArrayIndexOfVariant.Table) { + if (variant == LIRGeneratorTool.ArrayIndexOfVariant.Table) { return vectorSize.getBytes(); } return (i + 1) * vectorKind.getVectorLength() + (findTwoConsecutive ? 1 : 0); @@ -625,10 +622,10 @@ private void emitVectorCompare(AMD64MacroAssembler asm, Label[] vectorFound, boolean shortJmp) { // load array contents into vectors - int nVectorLoads = variant == ArrayIndexOfVariant.Table ? stride.value : nVectors; + int nVectorLoads = variant == LIRGeneratorTool.ArrayIndexOfVariant.Table ? stride.value : nVectors; for (int i = 0; i < nVectorLoads; i++) { int base = i * nValues; - for (int j = 0; j < (withMask || variant == ArrayIndexOfVariant.MatchRange ? nValues / 2 : nValues); j++) { + for (int j = 0; j < (withMask || variant == LIRGeneratorTool.ArrayIndexOfVariant.MatchRange ? nValues / 2 : nValues); j++) { emitArrayLoad(asm, vSize, vecArray[base + j], arrayPtr, index, getVectorOffset(nVectorLoads - (i + 1), j, vSize)); } } diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayRegionCompareToOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayRegionCompareToOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java index 45dcec49c63c..b52b25c86110 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ArrayRegionCompareToOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r8; import static jdk.vm.ci.amd64.AMD64.rax; @@ -32,28 +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 org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.core.common.StrideUtil; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.code.Register; @@ -97,22 +95,22 @@ public final class AMD64ArrayRegionCompareToOp extends AMD64ComplexVectorOp { private final Stride argStrideB; private final AMD64MacroAssembler.ExtendMode extendMode; - @Def({REG}) private Value resultValue; - @Use({REG}) private Value arrayAValue; - @Use({REG}) private Value offsetAValue; - @Use({REG}) private Value arrayBValue; - @Use({REG, ILLEGAL}) private Value offsetBValue; - @Use({REG}) private Value lengthValue; - @Use({REG, ILLEGAL}) private Value dynamicStridesValue; - - @Temp({REG}) private Value arrayAValueTemp; - @Temp({REG}) private Value offsetAValueTemp; - @Temp({REG}) private Value arrayBValueTemp; - @Temp({REG, ILLEGAL}) private Value offsetBValueTemp; - @Temp({REG}) private Value lengthValueTemp; - @Temp({REG, ILLEGAL}) private Value dynamicStridesValueTemp; - - @Temp({REG}) Value[] vectorTemp; + @Def({OperandFlag.REG}) private Value resultValue; + @Use({OperandFlag.REG}) private Value arrayAValue; + @Use({OperandFlag.REG}) private Value offsetAValue; + @Use({OperandFlag.REG}) private Value arrayBValue; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value offsetBValue; + @Use({OperandFlag.REG}) private Value lengthValue; + @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value dynamicStridesValue; + + @Temp({OperandFlag.REG}) private Value arrayAValueTemp; + @Temp({OperandFlag.REG}) private Value offsetAValueTemp; + @Temp({OperandFlag.REG}) private Value arrayBValueTemp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value offsetBValueTemp; + @Temp({OperandFlag.REG}) private Value lengthValueTemp; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value dynamicStridesValueTemp; + + @Temp({OperandFlag.REG}) Value[] vectorTemp; private AMD64ArrayRegionCompareToOp(LIRGeneratorTool tool, Stride strideA, Stride strideB, EnumSet runtimeCheckedCPUFeatures, Value result, Value arrayA, Value offsetA, Value arrayB, Value offsetB, Value length, Value dynamicStrides, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java index ccbe92f2ea30..33c93c0b1c2e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerMulAddOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -40,17 +40,16 @@ import static jdk.vm.ci.amd64.AMD64.CPUFeature.AVX; import static jdk.vm.ci.amd64.AMD64.CPUFeature.BMI2; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; + +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -69,16 +68,16 @@ public final class AMD64BigIntegerMulAddOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64BigIntegerMulAddOp.class); - @Def({REG}) private Value result; + @Def({OperandFlag.REG}) private Value result; - @Use({REG}) private Value outValue; - @Use({REG}) private Value inValue; - @Use({REG}) private Value offsetValue; - @Use({REG}) private Value lenValue; - @Use({REG}) private Value kValue; + @Use({OperandFlag.REG}) private Value outValue; + @Use({OperandFlag.REG}) private Value inValue; + @Use({OperandFlag.REG}) private Value offsetValue; + @Use({OperandFlag.REG}) private Value lenValue; + @Use({OperandFlag.REG}) private Value kValue; - @Temp({REG}) private Value tmp1Value; - @Temp({REG}) private Value[] tmpValues; + @Temp({OperandFlag.REG}) private Value tmp1Value; + @Temp({OperandFlag.REG}) private Value[] tmpValues; public AMD64BigIntegerMulAddOp( Value outValue, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java similarity index 96% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java index 85a4d1173366..2986021e7e22 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -41,17 +41,16 @@ import static jdk.vm.ci.amd64.AMD64.CPUFeature.AVX; import static jdk.vm.ci.amd64.AMD64.CPUFeature.BMI2; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; + +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -67,15 +66,15 @@ public final class AMD64BigIntegerMultiplyToLenOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64BigIntegerMultiplyToLenOp.class); - @Use({REG}) private Value xValue; - @Use({REG}) private Value xlenValue; - @Use({REG}) private Value yValue; - @Use({REG}) private Value ylenValue; - @Use({REG}) private Value zValue; - @Use({REG}) private Value zlenValue; + @Use({OperandFlag.REG}) private Value xValue; + @Use({OperandFlag.REG}) private Value xlenValue; + @Use({OperandFlag.REG}) private Value yValue; + @Use({OperandFlag.REG}) private Value ylenValue; + @Use({OperandFlag.REG}) private Value zValue; + @Use({OperandFlag.REG}) private Value zlenValue; - @Temp({REG}) private Value tmp1Value; - @Temp({REG}) private Value[] tmpValues; + @Temp({OperandFlag.REG}) private Value tmp1Value; + @Temp({OperandFlag.REG}) private Value[] tmpValues; public AMD64BigIntegerMultiplyToLenOp( Value xValue, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java index cd11ebe1fc78..b5044ec47e2b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BigIntegerSquareToLenOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r10; import static jdk.vm.ci.amd64.AMD64.r11; @@ -37,20 +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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64BigIntegerMulAddOp.multiplyAdd64; -import static org.graalvm.compiler.lir.amd64.AMD64BigIntegerMulAddOp.multiplyAdd64Bmi2; -import static org.graalvm.compiler.lir.amd64.AMD64BigIntegerMulAddOp.useBMI2Instructions; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -66,13 +65,13 @@ public final class AMD64BigIntegerSquareToLenOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64BigIntegerSquareToLenOp.class); - @Use({REG}) private Value xValue; - @Use({REG}) private Value lenValue; - @Use({REG}) private Value zValue; - @Use({REG}) private Value zlenValue; + @Use({OperandFlag.REG}) private Value xValue; + @Use({OperandFlag.REG}) private Value lenValue; + @Use({OperandFlag.REG}) private Value zValue; + @Use({OperandFlag.REG}) private Value zlenValue; - @Temp({REG}) private Value tmp1Value; - @Temp({REG}) private Value[] tmpValues; + @Temp({OperandFlag.REG}) private Value tmp1Value; + @Temp({OperandFlag.REG}) private Value[] tmpValues; public AMD64BigIntegerSquareToLenOp( Value xValue, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java similarity index 77% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java index 07e2103c926a..c4c1fff998d4 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Binary.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java @@ -22,31 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; -import static org.graalvm.compiler.lir.LIRValueUtil.differentRegisters; -import static org.graalvm.compiler.lir.LIRValueUtil.sameRegister; - -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp.ImplicitNullCheck; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; + +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.vm.ci.code.site.DataSectionReference; import jdk.vm.ci.meta.AllocatableValue; @@ -67,13 +63,13 @@ public static class TwoOp extends AMD64LIRInstruction { @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Def({REG, HINT}) protected AllocatableValue result; - @Use({REG}) protected AllocatableValue x; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; /** * This argument must be Alive to ensure that result and y are not assigned to the same * register, which would break the code generation by destroying y too early. */ - @Alive({REG, STACK}) protected AllocatableValue y; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue y; public TwoOp(AMD64RMOp opcode, OperandSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y) { super(TYPE); @@ -106,9 +102,9 @@ public static class CommutativeTwoOp extends AMD64LIRInstruction { @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Def({REG, HINT}) protected AllocatableValue result; - @Use({REG, STACK}) protected AllocatableValue x; - @Use({REG, STACK}) protected AllocatableValue y; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue y; public CommutativeTwoOp(AMD64RMOp opcode, OperandSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y) { super(TYPE); @@ -123,7 +119,7 @@ public CommutativeTwoOp(AMD64RMOp opcode, OperandSize size, AllocatableValue res @Override public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { AllocatableValue input; - if (sameRegister(result, y)) { + if (LIRValueUtil.sameRegister(result, y)) { input = x; } else { AMD64Move.move(crb, masm, result, x); @@ -153,8 +149,8 @@ public static class ConstOp extends AMD64LIRInstruction { @Opcode private final AMD64MIOp opcode; private final OperandSize size; - @Def({REG, HINT}) protected AllocatableValue result; - @Use({REG}) protected AllocatableValue x; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; private final int y; public ConstOp(AMD64BinaryArithmetic opcode, OperandSize size, AllocatableValue result, AllocatableValue x, int y) { @@ -188,8 +184,8 @@ public static class DataTwoOp extends AMD64LIRInstruction { @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Def({REG, HINT}) protected AllocatableValue result; - @Use({REG}) protected AllocatableValue x; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; private final JavaConstant y; private final int alignment; @@ -221,17 +217,17 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { * Instruction that has one {@link AllocatableValue} operand and one {@link AMD64AddressValue * memory} operand. */ - public static class MemoryTwoOp extends AMD64LIRInstruction implements ImplicitNullCheck { + public static class MemoryTwoOp extends AMD64LIRInstruction implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MemoryTwoOp.class); @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Def({REG, HINT}) protected AllocatableValue result; - @Use({REG}) protected AllocatableValue x; - @Alive({COMPOSITE}) protected AMD64AddressValue y; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.COMPOSITE}) protected AMD64AddressValue y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public MemoryTwoOp(AMD64RMOp opcode, OperandSize size, AllocatableValue result, AllocatableValue x, AMD64AddressValue y, LIRFrameState state) { super(TYPE); @@ -257,7 +253,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { @Override public void verify() { super.verify(); - assert differentRegisters(result, y) || sameRegister(x, y); + assert LIRValueUtil.differentRegisters(result, y) || LIRValueUtil.sameRegister(x, y); } @Override @@ -285,8 +281,8 @@ public static class RMIOp extends AMD64LIRInstruction { @Opcode private final AMD64RMIOp opcode; private final OperandSize size; - @Def({REG}) protected AllocatableValue result; - @Use({REG, STACK}) protected AllocatableValue x; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected AllocatableValue result; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue x; private final int y; public RMIOp(AMD64RMIOp opcode, OperandSize size, AllocatableValue result, AllocatableValue x, int y) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java index 3e8c0b3f8a9a..65e96249a54e 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BinaryConsumer.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java @@ -22,29 +22,27 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; - -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MROp; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp.ImplicitNullCheck; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.code.site.DataSectionReference; import jdk.vm.ci.meta.AllocatableValue; @@ -66,8 +64,8 @@ public static class Op extends AMD64LIRInstruction { @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Use({REG}) protected AllocatableValue x; - @Use({REG, STACK}) protected AllocatableValue y; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue y; public Op(AMD64RMOp opcode, OperandSize size, AllocatableValue x, AllocatableValue y) { super(TYPE); @@ -98,7 +96,7 @@ public static class ConstOp extends AMD64LIRInstruction { @Opcode private final AMD64MIOp opcode; private final OperandSize size; - @Use({REG, STACK}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue x; private final int y; public ConstOp(AMD64BinaryArithmetic opcode, OperandSize size, AllocatableValue x, int y) { @@ -173,7 +171,7 @@ public static class DataOp extends AMD64LIRInstruction { @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Use({REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; private final Constant y; private final int alignment; @@ -203,16 +201,16 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { * Instruction that has an {@link AllocatableValue} as first input and a * {@link AMD64AddressValue memory} operand as second input. */ - public static class MemoryRMOp extends AMD64LIRInstruction implements ImplicitNullCheck { + public static class MemoryRMOp extends AMD64LIRInstruction implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MemoryRMOp.class); @Opcode private final AMD64RMOp opcode; private final OperandSize size; - @Use({REG}) protected AllocatableValue x; - @Use({COMPOSITE}) protected AMD64AddressValue y; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.COMPOSITE}) protected AMD64AddressValue y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public MemoryRMOp(AMD64RMOp opcode, OperandSize size, AllocatableValue x, AMD64AddressValue y, LIRFrameState state) { super(TYPE); @@ -247,16 +245,16 @@ public boolean makeNullCheckFor(Value value, LIRFrameState nullCheckState, int i * Instruction that has a {@link AMD64AddressValue memory} operand as first input and an * {@link AllocatableValue} as second input. */ - public static class MemoryMROp extends AMD64LIRInstruction implements ImplicitNullCheck { + public static class MemoryMROp extends AMD64LIRInstruction implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MemoryMROp.class); @Opcode private final AMD64MROp opcode; private final OperandSize size; - @Use({COMPOSITE}) protected AMD64AddressValue x; - @Use({REG}) protected AllocatableValue y; + @LIRInstruction.Use({LIRInstruction.OperandFlag.COMPOSITE}) protected AMD64AddressValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public MemoryMROp(AMD64MROp opcode, OperandSize size, AMD64AddressValue x, AllocatableValue y, LIRFrameState state) { super(TYPE); @@ -295,16 +293,16 @@ public AMD64MROp getOpcode() { * Instruction that has one {@link AMD64AddressValue memory} operand and one 32-bit immediate * operand. */ - public static class MemoryConstOp extends AMD64LIRInstruction implements ImplicitNullCheck { + public static class MemoryConstOp extends AMD64LIRInstruction implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MemoryConstOp.class); @Opcode private final AMD64MIOp opcode; private final OperandSize size; - @Use({COMPOSITE}) protected AMD64AddressValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.COMPOSITE}) protected AMD64AddressValue x; private final int y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public MemoryConstOp(AMD64MIOp opcode, OperandSize size, AMD64AddressValue x, int y, LIRFrameState state) { this(TYPE, opcode, size, x, y, state); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BitSwapOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BitSwapOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java index b97a9c9489eb..8435b1271acc 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BitSwapOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java @@ -22,20 +22,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.CPUFeature.GFNI; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -50,14 +49,14 @@ public final class AMD64BitSwapOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64BitSwapOp.class); - @Def({REG}) protected Value dstValue; - @Alive({REG}) protected Value srcValue; + @Def({LIRInstruction.OperandFlag.REG}) protected Value dstValue; + @Alive({LIRInstruction.OperandFlag.REG}) protected Value srcValue; - @Temp({REG}) protected Value rtmpValue; - @Temp({REG, ILLEGAL}) protected Value rtmp2Value; + @Temp({LIRInstruction.OperandFlag.REG}) protected Value rtmpValue; + @Temp({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected Value rtmp2Value; - @Temp({REG, ILLEGAL}) protected Value xtmp1Value; - @Temp({REG, ILLEGAL}) protected Value xtmp2Value; + @Temp({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected Value xtmp1Value; + @Temp({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected Value xtmp2Value; public AMD64BitSwapOp(LIRGeneratorTool tool, Value dstValue, Value srcValue) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java index 358854b7a9ee..79360f9f0e8d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BlockEndOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java @@ -22,15 +22,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.StandardOp.BlockEndOp; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; -public abstract class AMD64BlockEndOp extends LIRInstruction implements BlockEndOp { +public abstract class AMD64BlockEndOp extends LIRInstruction implements StandardOp.BlockEndOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64BlockEndOp.class); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java similarity index 80% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java index 81bb0ddd8df8..150e15c045bf 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64BreakpointOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java @@ -22,15 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; - -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.meta.Value; @@ -44,7 +41,7 @@ public final class AMD64BreakpointOp extends AMD64LIRInstruction { /** * A set of values loaded into the Java ABI parameter locations (for inspection by a debugger). */ - @Use({REG, STACK}) protected Value[] parameters; + @Use({OperandFlag.REG, OperandFlag.STACK}) protected Value[] parameters; public AMD64BreakpointOp(Value[] parameters) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java index 28c0f2f31705..c9cdb1a3af04 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ByteSwapOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.ValueUtil; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CacheWritebackOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java similarity index 83% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CacheWritebackOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java index 93ea8351528f..d0fdf89a7f95 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CacheWritebackOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java @@ -23,13 +23,12 @@ * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; - -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Implements {@code jdk.internal.misc.Unsafe.writeback0(long)}. @@ -37,7 +36,7 @@ public final class AMD64CacheWritebackOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64CacheWritebackOp.class); - @Alive({COMPOSITE}) protected AMD64AddressValue address; + @Alive({LIRInstruction.OperandFlag.COMPOSITE}) protected AMD64AddressValue address; public AMD64CacheWritebackOp(AMD64AddressValue address) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CacheWritebackPostSyncOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CacheWritebackPostSyncOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java index 7d2a781a4e89..bad00bc7f0b8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CacheWritebackPostSyncOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java @@ -23,14 +23,14 @@ * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.CPUFeature.CLWB; import static jdk.vm.ci.amd64.AMD64.CPUFeature.FLUSHOPT; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler; +import jdk.compiler.graal.lir.LIRInstructionClass; +import jdk.compiler.graal.lir.asm.CompilationResultBuilder; /** * Implements {@code jdk.internal.misc.Unsafe.writebackPostSync0(long)}. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CalcStringAttributesOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CalcStringAttributesOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java index b919ed38a4e7..2f0c60673e4d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CalcStringAttributesOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java @@ -22,49 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Less; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotZero; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Zero; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID; -import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE; +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 java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; @@ -90,7 +81,7 @@ public final class AMD64CalcStringAttributesOp extends AMD64ComplexVectorOp { // The following fields must be kept in sync with com.oracle.truffle.api.strings.TSCodeRange, // TStringOpsCalcStringAttributesReturnValuesInSyncTest verifies this. - private final CalcStringAttributesEncoding encoding; + private final LIRGeneratorTool.CalcStringAttributesEncoding encoding; private final Stride stride; private final int vectorLength; @@ -99,19 +90,19 @@ public final class AMD64CalcStringAttributesOp extends AMD64ComplexVectorOp { */ private final boolean assumeValid; - @Def({REG}) private Value result; - @Use({REG}) private Value array; - @Use({REG}) private Value offset; - @Use({REG}) private Value length; + @Def({OperandFlag.REG}) private Value result; + @Use({OperandFlag.REG}) private Value array; + @Use({OperandFlag.REG}) private Value offset; + @Use({OperandFlag.REG}) private Value length; - @Temp({REG}) private Value arrayTmp; - @Temp({REG}) private Value offsetTmp; - @Temp({REG}) private Value lengthTmp; + @Temp({OperandFlag.REG}) private Value arrayTmp; + @Temp({OperandFlag.REG}) private Value offsetTmp; + @Temp({OperandFlag.REG}) private Value lengthTmp; - @Temp({REG}) private Value[] temp; - @Temp({REG}) private Value[] vectorTemp; + @Temp({OperandFlag.REG}) private Value[] temp; + @Temp({OperandFlag.REG}) private Value[] vectorTemp; - private AMD64CalcStringAttributesOp(LIRGeneratorTool tool, CalcStringAttributesEncoding encoding, EnumSet runtimeCheckedCPUFeatures, Value array, Value offset, + private AMD64CalcStringAttributesOp(LIRGeneratorTool tool, LIRGeneratorTool.CalcStringAttributesEncoding encoding, EnumSet runtimeCheckedCPUFeatures, Value array, Value offset, Value length, Value result, boolean assumeValid) { super(TYPE, tool, runtimeCheckedCPUFeatures, YMM); this.encoding = encoding; @@ -137,7 +128,7 @@ private AMD64CalcStringAttributesOp(LIRGeneratorTool tool, CalcStringAttributesE } } - private static int getNumberOfTempRegisters(CalcStringAttributesEncoding encoding, boolean assumeValid) { + private static int getNumberOfTempRegisters(LIRGeneratorTool.CalcStringAttributesEncoding encoding, boolean assumeValid) { switch (encoding) { case UTF_8: return assumeValid ? 1 : 3; @@ -148,7 +139,7 @@ private static int getNumberOfTempRegisters(CalcStringAttributesEncoding encodin } } - private static int getNumberOfRequiredVectorRegisters(CalcStringAttributesEncoding encoding, boolean isAVX, boolean assumeValid) { + private static int getNumberOfRequiredVectorRegisters(LIRGeneratorTool.CalcStringAttributesEncoding encoding, boolean isAVX, boolean assumeValid) { switch (encoding) { case LATIN1: return isAVX ? 1 : 2; @@ -181,10 +172,10 @@ private int elementsPerVector(AMD64BaseAssembler.OperandSize size) { * @param array arbitrary array. * @param byteOffset byteOffset to start from. Must include array base byteOffset! * @param length length of the array region to consider, scaled to - * {@link CalcStringAttributesEncoding#stride}. + * {@link LIRGeneratorTool.CalcStringAttributesEncoding#stride}. * @param assumeValid assume that the string is encoded correctly. */ - public static AMD64CalcStringAttributesOp movParamsAndCreate(LIRGeneratorTool tool, CalcStringAttributesEncoding encoding, EnumSet runtimeCheckedCPUFeatures, + public static AMD64CalcStringAttributesOp movParamsAndCreate(LIRGeneratorTool tool, LIRGeneratorTool.CalcStringAttributesEncoding encoding, EnumSet runtimeCheckedCPUFeatures, Value array, Value byteOffset, Value length, Value result, boolean assumeValid) { @@ -262,7 +253,7 @@ private void emitLatin1(CompilationResultBuilder crb, AMD64MacroAssembler asm, R emitPTestTail(asm, XMM, arr, lengthTail, vecArray, vecMask, null, returnLatin1, returnAscii); } - emitExit(asm, ret, returnLatin1, end, CR_8BIT); + emitExit(asm, ret, returnLatin1, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT); asm.bind(tailLessThan16); // move mask into general purpose register for regular TEST instructions @@ -281,7 +272,7 @@ private void emitLatin1(CompilationResultBuilder crb, AMD64MacroAssembler asm, R asm.testAndJcc(AMD64BaseAssembler.OperandSize.QWORD, len, 0x80, NotZero, returnLatin1, true); asm.jmpb(returnAscii); - emitExitAtEnd(asm, ret, returnAscii, end, CR_7BIT); + emitExitAtEnd(asm, ret, returnAscii, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT); } private void latin1Tail(AMD64MacroAssembler asm, AMD64BaseAssembler.OperandSize size, @@ -407,9 +398,9 @@ private void emitBMP(CompilationResultBuilder crb, AMD64MacroAssembler asm, Regi bmpTail(asm, arr, lengthTail, vecArray, vecMaskAscii, vecMaskBMP, tailLessThan32, tailLessThan16, returnBMP, returnLatin1, returnAscii); } - emitExit(asm, ret, returnAscii, end, CR_7BIT); - emitExit(asm, ret, returnLatin1, end, CR_8BIT); - emitExit(asm, ret, returnBMP, end, CR_16BIT); + emitExit(asm, ret, returnAscii, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT); + emitExit(asm, ret, returnLatin1, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT); + emitExit(asm, ret, returnBMP, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT); asm.bind(tailLessThan16); // move masks into general purpose registers for regular TEST instructions @@ -808,7 +799,7 @@ private void emitUTF8(CompilationResultBuilder crb, AMD64MacroAssembler asm, Reg asm.ptest(vectorSize, vecError, vecError); asm.jcc(Zero, returnValid); asm.shlq(ret, 32); - asm.orq(ret, CR_BROKEN_MULTIBYTE); + asm.orq(ret, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE); asm.jmp(end); asm.bind(tailLessThan32); @@ -882,12 +873,12 @@ private void emitUTF8(CompilationResultBuilder crb, AMD64MacroAssembler asm, Reg asm.testqAndJcc(state, state, Zero, returnValid, true); asm.shlq(ret, 32); - asm.orq(ret, CR_BROKEN_MULTIBYTE); + asm.orq(ret, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE); asm.jmpb(end); } - emitExitMultiByte(asm, ret, returnValid, end, CR_VALID_MULTIBYTE); - emitExitMultiByteAtEnd(asm, ret, returnAscii, end, CR_7BIT); + emitExitMultiByte(asm, ret, returnValid, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE); + emitExitMultiByteAtEnd(asm, ret, returnAscii, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT); } /** @@ -997,7 +988,7 @@ private void emitUTF16(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re asm.movl(ret, len); if (!assumeValid) { - asm.movl(retBroken, CR_VALID_MULTIBYTE); + asm.movl(retBroken, LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE); asm.pxor(vectorSize, vecResult, vecResult); } @@ -1065,7 +1056,7 @@ private void emitUTF16(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re asm.movzwl(tmp, new AMD64Address(arr, len, stride)); asm.shrl(tmp, 10); asm.cmpl(tmp, 0x37); - asm.movl(tmp, CR_BROKEN_MULTIBYTE); + asm.movl(tmp, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE); asm.cmovl(Equal, retBroken, tmp); // high surrogate mask: 0x1b << 1 == 0x36 asm.psllw(vectorSize, vecMaskSurrogate, vecMaskSurrogate, 1); @@ -1110,7 +1101,7 @@ private void emitUTF16(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re asm.shrl(tmp, 10); // if last char is a high surrogate, return BROKEN asm.cmpl(tmp, 0x36); - asm.movl(tmp, CR_BROKEN_MULTIBYTE); + asm.movl(tmp, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE); asm.cmovl(Equal, retBroken, tmp); asm.jmp(returnValidOrBroken); } @@ -1177,7 +1168,7 @@ private void emitUTF16(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re asm.movzwl(tmp, new AMD64Address(arr, -2)); asm.shrl(tmp, 10); asm.cmpl(tmp, 0x36); - asm.movl(tmp, CR_BROKEN_MULTIBYTE); + asm.movl(tmp, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE); asm.cmovl(Equal, retBroken, tmp); asm.bind(tailSingleVectorSurrogate); @@ -1195,17 +1186,17 @@ private void emitUTF16(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re utf16ValidateSurrogates(asm, ret, vecArrayTail, vecArray, vecMaskSurrogate, vecMaskAscii, vecTmp, vecResult, tmp); asm.jmpb(returnValidOrBroken); } - emitExitMultiByte(asm, ret, returnAscii, end, CR_7BIT); - emitExitMultiByte(asm, ret, returnLatin1, end, CR_8BIT); - emitExitMultiByte(asm, ret, returnBMP, end, CR_16BIT); + emitExitMultiByte(asm, ret, returnAscii, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT); + emitExitMultiByte(asm, ret, returnLatin1, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT); + emitExitMultiByte(asm, ret, returnBMP, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT); asm.bind(returnValidOrBroken); asm.shlq(ret, 32); if (assumeValid) { - asm.orq(ret, CR_VALID_MULTIBYTE); + asm.orq(ret, LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID_MULTIBYTE); } else { asm.ptest(vectorSize, vecResult, vecResult); - asm.movl(tmp, CR_BROKEN_MULTIBYTE); + asm.movl(tmp, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN_MULTIBYTE); asm.cmovl(NotZero, retBroken, tmp); asm.orq(ret, retBroken); } @@ -1322,8 +1313,8 @@ private void emitUTF32(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re utf32CheckInvalid(asm, vecArrayTail, vecArrayTail, vecArrayTmp, vecMaskSurrogate, vecMaskOutOfRange, returnBroken, true); asm.jmpb(returnBMP); - emitExit(asm, ret, returnBroken, end, CR_BROKEN, false); - emitExit(asm, ret, returnBMP, end, CR_16BIT, false); + emitExit(asm, ret, returnBroken, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_BROKEN, false); + emitExit(asm, ret, returnBMP, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_16BIT, false); // astral loop: check if any codepoints are in the forbidden UTF-16 surrogate range; // if so, break immediately and return BROKEN @@ -1372,10 +1363,10 @@ private void emitUTF32(CompilationResultBuilder crb, AMD64MacroAssembler asm, Re asm.ptest(vectorSize, vecArray, vecMaskBMP); asm.jcc(Zero, returnBMP); - emitExit(asm, ret, returnAstral, end, CR_VALID); + emitExit(asm, ret, returnAstral, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_VALID); - emitExit(asm, ret, returnLatin1, end, CR_8BIT); - emitExitAtEnd(asm, ret, returnAscii, end, CR_7BIT); + emitExit(asm, ret, returnLatin1, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_8BIT); + emitExitAtEnd(asm, ret, returnAscii, end, LIRGeneratorTool.CalcStringAttributesEncoding.CR_7BIT); } private void utf32CheckInvalid(AMD64MacroAssembler asm, Register vecArrayDst, Register vecArraySrc, Register vecArrayTmp, Register vecMaskBroken, Register vecMaskOutOfRange, Label returnBroken, diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Call.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Call.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Call.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Call.java index 7a8b8672e757..b9851ee765b3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Call.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Call.java @@ -22,25 +22,22 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; import static jdk.vm.ci.code.ValueUtil.isRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; -import static org.graalvm.compiler.lir.LIRValueUtil.differentRegisters; - -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.code.CompilationResult.MarkId; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.spi.ForeignCallLinkage; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction; + +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -57,9 +54,9 @@ public class AMD64Call { public abstract static class CallOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(CallOp.class); - @Def({REG, ILLEGAL}) protected Value result; - @Use({REG, STACK}) protected Value[] parameters; - @Temp({REG, STACK}) protected Value[] temps; + @Def({OperandFlag.REG, OperandFlag.ILLEGAL}) protected Value result; + @Use({OperandFlag.REG, OperandFlag.STACK}) protected Value[] parameters; + @Temp({OperandFlag.REG, OperandFlag.STACK}) protected Value[] temps; @State protected LIRFrameState state; protected CallOp(LIRInstructionClass c, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { @@ -102,7 +99,7 @@ protected DirectCallOp(LIRInstructionClass c, ResolvedJa public static class IndirectCallOp extends MethodCallOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(IndirectCallOp.class); - @Use({REG}) protected Value targetAddress; + @Use({OperandFlag.REG}) protected Value targetAddress; public IndirectCallOp(ResolvedJavaMethod callTarget, Value result, Value[] parameters, Value[] temps, Value targetAddress, LIRFrameState state) { this(TYPE, callTarget, result, parameters, temps, targetAddress, state); @@ -126,7 +123,7 @@ public void verify() { } } - public abstract static class ForeignCallOp extends CallOp implements ZapRegistersAfterInstruction { + public abstract static class ForeignCallOp extends CallOp implements DiagnosticLIRGeneratorTool.ZapRegistersAfterInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ForeignCallOp.class); protected final ForeignCallLinkage callTarget; @@ -165,7 +162,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { public static final class DirectFarForeignCallOp extends ForeignCallOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(DirectFarForeignCallOp.class); - @Temp({REG}) protected AllocatableValue callTemp; + @Temp({OperandFlag.REG}) protected AllocatableValue callTemp; public DirectFarForeignCallOp(ForeignCallLinkage callTarget, Value result, Value[] parameters, Value[] temps, LIRFrameState state) { super(TYPE, callTarget, result, parameters, temps, state); @@ -174,7 +171,7 @@ public DirectFarForeignCallOp(ForeignCallLinkage callTarget, Value result, Value * site, so use a fixed register. */ callTemp = AMD64.rax.asValue(LIRKind.value(AMD64Kind.QWORD)); - assert differentRegisters(parameters, callTemp); + assert LIRValueUtil.differentRegisters(parameters, callTemp); } @Override diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java similarity index 92% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java index 4d2329994814..aa762955010c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r11; import static jdk.vm.ci.amd64.AMD64.rbx; @@ -44,25 +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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.asXMMRegister; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; -import static org.graalvm.compiler.lir.amd64.AMD64CounterModeAESCryptOp.newLabels; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; +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 java.util.function.BiConsumer; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -79,13 +78,13 @@ public final class AMD64CipherBlockChainingAESDecryptOp extends AMD64LIRInstruct private final int lengthOffset; - @Alive({REG}) protected Value fromValue; - @Alive({REG}) protected Value toValue; - @Alive({REG}) protected Value keyValue; - @Alive({REG}) protected Value rvecValue; - @Alive({REG}) protected Value lenValue; + @Alive({OperandFlag.REG}) protected Value fromValue; + @Alive({OperandFlag.REG}) protected Value toValue; + @Alive({OperandFlag.REG}) protected Value keyValue; + @Alive({OperandFlag.REG}) protected Value rvecValue; + @Alive({OperandFlag.REG}) protected Value lenValue; - @Def({REG}) protected Value resultValue; + @Def({OperandFlag.REG}) protected Value resultValue; @Temp protected Value[] temps; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java index 9b90770ee28f..505b4e06aa29 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r11; import static jdk.vm.ci.amd64.AMD64.xmm0; @@ -42,22 +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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.asXMMRegister; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -74,13 +73,13 @@ public final class AMD64CipherBlockChainingAESEncryptOp extends AMD64LIRInstruct private final int lengthOffset; - @Alive({REG}) protected Value fromValue; - @Alive({REG}) protected Value toValue; - @Alive({REG}) protected Value keyValue; - @Alive({REG}) protected Value rvecValue; - @Alive({REG}) protected Value lenValue; + @Alive({OperandFlag.REG}) protected Value fromValue; + @Alive({OperandFlag.REG}) protected Value toValue; + @Alive({OperandFlag.REG}) protected Value keyValue; + @Alive({OperandFlag.REG}) protected Value rvecValue; + @Alive({OperandFlag.REG}) protected Value lenValue; - @Def({REG}) protected Value resultValue; + @Def({OperandFlag.REG}) protected Value resultValue; @Temp protected Value[] temps; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java similarity index 76% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java index d945aa4a38b5..07807ad7c012 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ClearRegisterOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java @@ -22,18 +22,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.asm.amd64.AMD64Assembler.AMD64BinaryArithmetic.XOR; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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 jdk.vm.ci.meta.AllocatableValue; @@ -43,7 +42,7 @@ public class AMD64ClearRegisterOp extends AMD64LIRInstruction { @Opcode private final AMD64RMOp op; private final OperandSize size; - @Def({REG}) protected AllocatableValue result; + @Def({OperandFlag.REG}) protected AllocatableValue result; public AMD64ClearRegisterOp(OperandSize size, AllocatableValue result) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ComplexVectorOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ComplexVectorOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java index 7786a69b2d1a..00a706fd8820 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ComplexVectorOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java @@ -22,32 +22,32 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rcx; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp.TZCNT; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Less; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; +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 java.nio.ByteOrder; import java.util.Arrays; import java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.code.DataSection; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64.CPUFeature; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java index 7bc41fb844af..ba273db7efb8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ControlFlow.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java @@ -22,47 +22,40 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.WORD; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK; +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 java.util.Arrays; import java.util.function.IntConsumer; import java.util.function.Supplier; import java.util.stream.Stream; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.code.CompilationResult.JumpTable; -import org.graalvm.compiler.code.CompilationResult.JumpTable.EntryFormat; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.core.common.calc.Condition; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRFrameState; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.LabelRef; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.StandardOp; -import org.graalvm.compiler.lir.StandardOp.ImplicitNullCheck; -import org.graalvm.compiler.lir.SwitchStrategy; -import org.graalvm.compiler.lir.SwitchStrategy.BaseSwitchClosure; -import org.graalvm.compiler.lir.Variable; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -131,8 +124,8 @@ public static class TestByteBranchOp extends BranchOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(TestByteBranchOp.class); - @Use({REG}) protected AllocatableValue x; - @Use({REG, STACK}) protected AllocatableValue y; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue y; public TestByteBranchOp(AllocatableValue x, AllocatableValue y, Condition cond, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { super(TYPE, intCond(cond), trueDestination, falseDestination, trueDestinationProbability); @@ -172,16 +165,16 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { } } - public static class TestBranchOp extends BranchOp implements ImplicitNullCheck { + public static class TestBranchOp extends BranchOp implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(TestBranchOp.class); private final OperandSize size; - @Use({REG}) protected AllocatableValue x; - @Use({REG, STACK, COMPOSITE}) protected Value y; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK, LIRInstruction.OperandFlag.COMPOSITE}) protected Value y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public TestBranchOp(OperandSize size, AllocatableValue x, Value y, LIRFrameState state, Condition cond, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { @@ -251,16 +244,16 @@ public boolean makeNullCheckFor(Value value, LIRFrameState nullCheckState, int i } } - public static class TestConstBranchOp extends BranchOp implements ImplicitNullCheck { + public static class TestConstBranchOp extends BranchOp implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(TestConstBranchOp.class); private final OperandSize size; - @Use({REG, STACK, COMPOSITE}) protected Value x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK, LIRInstruction.OperandFlag.COMPOSITE}) protected Value x; private final int y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public TestConstBranchOp(OperandSize size, Value x, int y, LIRFrameState state, Condition cond, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { super(TYPE, intCond(cond), trueDestination, falseDestination, trueDestinationProbability); @@ -331,16 +324,16 @@ public boolean makeNullCheckFor(Value value, LIRFrameState nullCheckState, int i } } - public static class CmpBranchOp extends BranchOp implements ImplicitNullCheck { + public static class CmpBranchOp extends BranchOp implements StandardOp.ImplicitNullCheck { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(CmpBranchOp.class); private final OperandSize size; - @Use({REG}) protected AllocatableValue x; - @Use({REG, STACK, COMPOSITE}) protected Value y; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK, LIRInstruction.OperandFlag.COMPOSITE}) protected Value y; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public CmpBranchOp(OperandSize size, AllocatableValue x, Value y, LIRFrameState state, Condition cond, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { super(TYPE, intCond(cond), trueDestination, falseDestination, trueDestinationProbability); @@ -414,11 +407,11 @@ public static class CmpConstBranchOp extends BranchOp { private final OperandSize size; - @Use({REG, STACK, COMPOSITE}) protected Value x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK, LIRInstruction.OperandFlag.COMPOSITE}) protected Value x; private final int y; private final VMConstant inlinedY; - @State protected LIRFrameState state; + @LIRInstruction.State protected LIRFrameState state; public CmpConstBranchOp(OperandSize size, Value x, int y, LIRFrameState state, Condition cond, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { super(TYPE, intCond(cond), trueDestination, falseDestination, trueDestinationProbability); @@ -503,7 +496,7 @@ public static class CmpDataBranchOp extends BranchOp { private final OperandSize size; - @Use({REG}) protected AllocatableValue x; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x; private final Constant y; public CmpDataBranchOp(OperandSize size, AllocatableValue x, Constant y, Condition cond, LabelRef trueDestination, LabelRef falseDestination, double trueDestinationProbability) { @@ -575,8 +568,8 @@ public static class StrategySwitchOp extends AMD64BlockEndOp { protected final Constant[] keyConstants; private final LabelRef[] keyTargets; private LabelRef defaultTarget; - @Alive({REG}) protected AllocatableValue key; - @Temp({REG, ILLEGAL}) protected AllocatableValue scratch; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected AllocatableValue key; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected AllocatableValue scratch; protected final SwitchStrategy strategy; public StrategySwitchOp(SwitchStrategy strategy, LabelRef[] keyTargets, LabelRef defaultTarget, AllocatableValue key, AllocatableValue scratch) { @@ -601,7 +594,7 @@ public void emitCode(final CompilationResultBuilder crb, final AMD64MacroAssembl strategy.run(new SwitchClosure(asRegister(key), crb, masm)); } - public class SwitchClosure extends BaseSwitchClosure { + public class SwitchClosure extends SwitchStrategy.BaseSwitchClosure { protected final Register keyRegister; protected final CompilationResultBuilder crb; @@ -647,9 +640,9 @@ public static final class RangeTableSwitchOp extends AMD64BlockEndOp { private final int lowKey; private final LabelRef defaultTarget; private final LabelRef[] targets; - @Use protected Value index; - @Temp({REG, HINT}) protected Value idxScratch; - @Temp protected Value scratch; + @LIRInstruction.Use protected Value index; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected Value idxScratch; + @LIRInstruction.Temp protected Value scratch; public RangeTableSwitchOp(final int lowKey, final LabelRef defaultTarget, final LabelRef[] targets, Value index, Variable scratch, Variable idxScratch) { super(TYPE); @@ -732,10 +725,10 @@ public static final class HashTableSwitchOp extends AMD64BlockEndOp { private final JavaConstant[] keys; private final LabelRef defaultTarget; private final LabelRef[] targets; - @Alive({REG}) protected AllocatableValue value; - @Alive({REG}) protected AllocatableValue hash; - @Temp({REG}) protected AllocatableValue entryScratch; - @Temp({REG}) protected AllocatableValue scratch; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected AllocatableValue value; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected AllocatableValue hash; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) protected AllocatableValue entryScratch; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) protected AllocatableValue scratch; public HashTableSwitchOp(final JavaConstant[] keys, final LabelRef defaultTarget, LabelRef[] targets, AllocatableValue value, AllocatableValue hash, Variable scratch, Variable entryScratch) { super(TYPE); @@ -819,7 +812,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { @Opcode("SETcc") public static final class CondSetOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(CondSetOp.class); - @Def({REG, HINT}) protected Value result; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected Value result; private final ConditionFlag condition; public CondSetOp(Variable result, Condition condition) { @@ -837,7 +830,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { @Opcode("SETcc") public static final class FloatCondSetOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(FloatCondSetOp.class); - @Def({REG, HINT}) protected Value result; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected Value result; private final ConditionFlag condition; public FloatCondSetOp(Variable result, Condition condition) { @@ -855,9 +848,9 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { @Opcode("CMOVE") public static final class CondMoveOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(CondMoveOp.class); - @Def({REG, HINT}) protected Value result; - @Alive({REG}) protected Value trueValue; - @Use({REG, STACK, CONST}) protected Value falseValue; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected Value result; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected Value trueValue; + @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK, LIRInstruction.OperandFlag.CONST}) protected Value falseValue; private final ConditionFlag condition; public CondMoveOp(Variable result, Condition condition, AllocatableValue trueValue, Value falseValue) { @@ -877,9 +870,9 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { @Opcode("CMOVE") public static final class FloatCondMoveOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(FloatCondMoveOp.class); - @Def({REG}) protected Value result; - @Alive({REG}) protected Value trueValue; - @Alive({REG}) protected Value falseValue; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected Value result; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected Value trueValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected Value falseValue; private final ConditionFlag condition; private final boolean unorderedIsTrue; private final boolean isSelfEqualsCheck; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CountPositivesOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java similarity index 87% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CountPositivesOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java index 0f440c5fc7fd..c51280fb2c8b 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CountPositivesOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java @@ -22,33 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexGeneralPurposeRMVOp.SHLX; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.QWORD; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.ZMM; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; @@ -65,21 +62,21 @@ public final class AMD64CountPositivesOp extends AMD64ComplexVectorOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64CountPositivesOp.class); - @Def({REG}) private Value resultValue; - @Alive({REG}) private Value originArrayValue; - @Alive({REG, CONST}) private Value originLengthValue; + @Def({OperandFlag.REG}) private Value resultValue; + @Alive({OperandFlag.REG}) private Value originArrayValue; + @Alive({OperandFlag.REG, OperandFlag.CONST}) private Value originLengthValue; - @Temp({REG}) private Value arrayValue; - @Temp({REG}) private Value lenValue; + @Temp({OperandFlag.REG}) private Value arrayValue; + @Temp({OperandFlag.REG}) private Value lenValue; - @Temp({REG}) private Value tmpValue1; - @Temp({REG}) private Value tmpValue3; + @Temp({OperandFlag.REG}) private Value tmpValue1; + @Temp({OperandFlag.REG}) private Value tmpValue3; - @Temp({REG}) private Value vecValue1; - @Temp({REG}) private Value vecValue2; + @Temp({OperandFlag.REG}) private Value vecValue1; + @Temp({OperandFlag.REG}) private Value vecValue2; - @Temp({REG, ILLEGAL}) protected Value maskValue1; - @Temp({REG, ILLEGAL}) protected Value maskValue2; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) protected Value maskValue1; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) protected Value maskValue2; private final int useAVX3Threshold; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CounterModeAESCryptOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java similarity index 93% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CounterModeAESCryptOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java index ef94850bb806..ac43cba3d708 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64CounterModeAESCryptOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.r11; import static jdk.vm.ci.amd64.AMD64.rax; @@ -43,26 +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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.AES_BLOCK_SIZE; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.keyShuffleMask; -import static org.graalvm.compiler.lir.amd64.AMD64AESEncryptOp.loadKey; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; +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 java.util.function.BiConsumer; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -79,15 +78,15 @@ public final class AMD64CounterModeAESCryptOp extends AMD64LIRInstruction { private final int lengthOffset; - @Alive({REG}) private Value inValue; - @Alive({REG}) private Value outValue; - @Alive({REG}) private Value keyValue; - @Alive({REG}) private Value counterValue; - @Alive({REG}) private Value lenValue; - @Alive({REG}) private Value encryptedCounterValue; - @Alive({REG}) private Value usedPtrValue; + @Alive({OperandFlag.REG}) private Value inValue; + @Alive({OperandFlag.REG}) private Value outValue; + @Alive({OperandFlag.REG}) private Value keyValue; + @Alive({OperandFlag.REG}) private Value counterValue; + @Alive({OperandFlag.REG}) private Value lenValue; + @Alive({OperandFlag.REG}) private Value encryptedCounterValue; + @Alive({OperandFlag.REG}) private Value usedPtrValue; - @Def({REG}) protected Value resultValue; + @Def({OperandFlag.REG}) protected Value resultValue; @Temp protected Value[] temps; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64EncodeArrayOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java similarity index 81% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64EncodeArrayOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java index 5e6550a6663c..d08d9ee981b8 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64EncodeArrayOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java @@ -22,33 +22,30 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp.VPERMQ; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPACKUSWB; -import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPOR; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM; -import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +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 java.util.EnumSet; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.core.common.Stride; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool.CharsetName; +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.vm.ci.amd64.AMD64.CPUFeature; import jdk.vm.ci.amd64.AMD64Kind; @@ -64,25 +61,25 @@ public final class AMD64EncodeArrayOp extends AMD64ComplexVectorOp { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64EncodeArrayOp.class); - @Def({REG}) private Value resultValue; - @Alive({REG}) private Value originSrcValue; - @Alive({REG}) private Value originDstValue; - @Alive({REG, CONST}) private Value originLengthValue; + @Def({OperandFlag.REG}) private Value resultValue; + @Alive({OperandFlag.REG}) private Value originSrcValue; + @Alive({OperandFlag.REG}) private Value originDstValue; + @Alive({OperandFlag.REG, OperandFlag.CONST}) private Value originLengthValue; - @Temp({REG}) private Value srcValue; - @Temp({REG}) private Value dstValue; - @Temp({REG}) private Value lenValue; + @Temp({OperandFlag.REG}) private Value srcValue; + @Temp({OperandFlag.REG}) private Value dstValue; + @Temp({OperandFlag.REG}) private Value lenValue; - @Temp({REG}) private Value vectorTempValue1; - @Temp({REG}) private Value vectorTempValue2; - @Temp({REG}) private Value vectorTempValue3; - @Temp({REG}) private Value vectorTempValue4; + @Temp({OperandFlag.REG}) private Value vectorTempValue1; + @Temp({OperandFlag.REG}) private Value vectorTempValue2; + @Temp({OperandFlag.REG}) private Value vectorTempValue3; + @Temp({OperandFlag.REG}) private Value vectorTempValue4; - @Temp({REG}) private Value tempValue5; + @Temp({OperandFlag.REG}) private Value tempValue5; - private final CharsetName charset; + private final LIRGeneratorTool.CharsetName charset; - public AMD64EncodeArrayOp(LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures, Value result, Value src, Value dst, Value length, CharsetName charset) { + public AMD64EncodeArrayOp(LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures, Value result, Value src, Value dst, Value length, LIRGeneratorTool.CharsetName charset) { super(TYPE, tool, runtimeCheckedCPUFeatures, YMM); this.resultValue = result; @@ -103,7 +100,7 @@ public AMD64EncodeArrayOp(LIRGeneratorTool tool, EnumSet runtimeChec this.tempValue5 = tool.newVariable(LIRKind.value(AMD64Kind.DWORD)); this.charset = charset; - assert charset == CharsetName.ASCII || charset == CharsetName.ISO_8859_1; + assert charset == LIRGeneratorTool.CharsetName.ASCII || charset == LIRGeneratorTool.CharsetName.ISO_8859_1; } @Override @@ -127,7 +124,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) { Register vectorTemp4 = asRegister(vectorTempValue4); Register temp5 = asRegister(tempValue5); - boolean ascii = charset == CharsetName.ASCII; + boolean ascii = charset == LIRGeneratorTool.CharsetName.ASCII; int mask = ascii ? 0xff80ff80 : 0xff00ff00; int shortMask = ascii ? 0xff80 : 0xff00; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FloatToHalfFloatOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java similarity index 79% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FloatToHalfFloatOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java index 4c3159c2ffa0..75d48405ddf7 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FloatToHalfFloatOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java @@ -22,16 +22,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; @@ -43,10 +43,10 @@ public final class AMD64FloatToHalfFloatOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64FloatToHalfFloatOp.class); - @Def({REG}) protected Value dstValue; - @Alive({REG}) protected Value srcValue; + @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected Value dstValue; + @LIRInstruction.Alive({LIRInstruction.OperandFlag.REG}) protected Value srcValue; - @Temp({REG}) protected Value tmpValue; + @LIRInstruction.Temp({LIRInstruction.OperandFlag.REG}) protected Value tmpValue; public AMD64FloatToHalfFloatOp(LIRGeneratorTool tool, Value dstValue, Value srcValue) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java similarity index 97% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java index 1d2a06474e6a..c38e4132ad9d 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FrameMap.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.core.common.NumUtil; -import org.graalvm.compiler.lir.framemap.FrameMap; +import jdk.compiler.graal.core.common.NumUtil; +import jdk.compiler.graal.lir.framemap.FrameMap; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java similarity index 90% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java index f62a07323c9b..bce603bda3fa 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64FrameMapBuilder.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java @@ -22,10 +22,10 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.lir.framemap.FrameMap; -import org.graalvm.compiler.lir.framemap.FrameMapBuilderImpl; +import jdk.compiler.graal.lir.framemap.FrameMap; +import jdk.compiler.graal.lir.framemap.FrameMapBuilderImpl; import jdk.vm.ci.code.CodeCacheProvider; import jdk.vm.ci.code.RegisterConfig; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64GHASHProcessBlocksOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java similarity index 95% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64GHASHProcessBlocksOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java index b31450a9b8db..55c1dfab3250 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64GHASHProcessBlocksOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.xmm0; @@ -41,22 +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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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 jdk.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; @@ -72,10 +71,10 @@ public final class AMD64GHASHProcessBlocksOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64GHASHProcessBlocksOp.class); - @Alive({REG}) private Value stateValue; - @Alive({REG}) private Value htblValue; - @Alive({REG}) private Value originalDataValue; - @Alive({REG}) private Value originalBlocksValue; + @Alive({OperandFlag.REG}) private Value stateValue; + @Alive({OperandFlag.REG}) private Value htblValue; + @Alive({OperandFlag.REG}) private Value originalDataValue; + @Alive({OperandFlag.REG}) private Value originalBlocksValue; @Temp protected Value dataValue; @Temp protected Value blocksValue; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64HalfFloatToFloatOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java similarity index 84% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64HalfFloatToFloatOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java index 44e738dbec55..6ac7d9f3772c 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64HalfFloatToFloatOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java @@ -22,15 +22,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.code.Register; import jdk.vm.ci.meta.Value; @@ -42,8 +41,8 @@ public final class AMD64HalfFloatToFloatOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64HalfFloatToFloatOp.class); - @Def({REG}) protected Value dstValue; - @Use({REG}) protected Value srcValue; + @Def({OperandFlag.REG}) protected Value dstValue; + @Use({OperandFlag.REG}) protected Value srcValue; public AMD64HalfFloatToFloatOp(Value dstValue, Value srcValue) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64HaltOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64HaltOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java index 3997bc24ecb3..05a2f72e1ff2 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64HaltOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Emits a halt. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LFenceOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java similarity index 86% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LFenceOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java index 4b828a8d7854..1809a90fb684 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LFenceOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.Opcode; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; @Opcode("LFENCE") public final class AMD64LFenceOp extends AMD64LIRInstruction { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LIRHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java similarity index 89% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LIRHelper.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java index b7a2923ce68d..9fe0ddb994ba 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LIRHelper.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java @@ -22,13 +22,13 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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.vm.ci.amd64.AMD64; import jdk.vm.ci.amd64.AMD64Kind; diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java similarity index 88% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java index d02756e2b756..52d6f1bbfdeb 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64LIRInstruction.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java @@ -22,12 +22,12 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstruction; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * Convenience class to provide AMD64MacroAssembler for the {@link #emitCode} method. diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MD5Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java similarity index 91% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MD5Op.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java index db9a80e02aeb..310e150b0c67 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MD5Op.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java @@ -22,7 +22,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.amd64.AMD64.rax; import static jdk.vm.ci.amd64.AMD64.rbx; @@ -31,18 +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 org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; +import static jdk.compiler.graal.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual; -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -59,14 +57,14 @@ public final class AMD64MD5Op extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64MD5Op.class); - @Alive({REG}) private Value bufValue; - @Alive({REG}) private Value stateValue; - @Alive({REG, ILLEGAL}) private Value ofsValue; - @Alive({REG, ILLEGAL}) private Value limitValue; + @Alive({OperandFlag.REG}) private Value bufValue; + @Alive({OperandFlag.REG}) private Value stateValue; + @Alive({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsValue; + @Alive({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value limitValue; - @Temp({REG, ILLEGAL}) private Value bufTempValue; - @Temp({REG, ILLEGAL}) private Value ofsTempValue; - @Temp({REG}) private Value[] temps; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value bufTempValue; + @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsTempValue; + @Temp({OperandFlag.REG}) private Value[] temps; private final boolean multiBlock; public AMD64MD5Op(LIRGeneratorTool tool, AllocatableValue bufValue, AllocatableValue stateValue) { diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathCopySignOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java similarity index 78% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathCopySignOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java index cb2eb9edbbce..50eca53434ec 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathCopySignOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java @@ -22,20 +22,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.lir.amd64; import static jdk.vm.ci.code.ValueUtil.asRegister; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT; -import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize; -import org.graalvm.compiler.core.common.LIRKind; -import org.graalvm.compiler.debug.GraalError; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; -import org.graalvm.compiler.lir.gen.LIRGeneratorTool; +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.vm.ci.amd64.AMD64Kind; import jdk.vm.ci.code.Register; @@ -46,13 +44,13 @@ public class AMD64MathCopySignOp extends AMD64LIRInstruction { public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64MathCopySignOp.class); - @Def({REG, HINT}) protected Value result; + @Def({OperandFlag.REG, OperandFlag.HINT}) protected Value result; - @Use({REG}) protected Value magnitude; - @Alive({REG}) protected Value sign; + @Use({OperandFlag.REG}) protected Value magnitude; + @Alive({OperandFlag.REG}) protected Value sign; - @Temp({REG}) protected Value scratchGP; - @Temp({REG}) protected Value scratchXMM; + @Temp({OperandFlag.REG}) protected Value scratchGP; + @Temp({OperandFlag.REG}) protected Value scratchXMM; public AMD64MathCopySignOp(LIRGeneratorTool tool, Value result, AllocatableValue magnitude, AllocatableValue sign) { super(TYPE); diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java similarity index 98% rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java index fec63ab3468a..0fd2abdd67a3 100644 --- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathCosOp.java +++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java @@ -24,7 +24,7 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -package org.graalvm.compiler.lir.amd64; +package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant; -import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress; - -import org.graalvm.compiler.asm.Label; -import org.graalvm.compiler.asm.amd64.AMD64Address; -import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag; -import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler; -import org.graalvm.compiler.lir.LIRInstructionClass; -import org.graalvm.compiler.lir.SyncPort; -import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant; -import org.graalvm.compiler.lir.asm.CompilationResultBuilder; +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; /** * 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
index 8caec9d622b9..3a3747b479b9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathExpOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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;
 
 /**
  * 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
index 8c095b088c97..cb8107f3f5c5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicBinaryOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 import static jdk.vm.ci.amd64.AMD64.xmm1;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.registersToValues;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.registersToValues;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
+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.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
index 0e6b70e37d17..774cb08f07d6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathIntrinsicUnaryOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.registersToValues;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.registersToValues;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
index 373afc536e35..19c1e9c5793e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathLog10Op.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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;
 
 /**
  * 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
index cc58b073562a..96c05e28d9e0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathLogOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
index c0e54a0b40f3..d19fa8b9b279 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathPowOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.code.Register;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathSignumOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathSignumOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
index 843d46489147..198d7297a564 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathSignumOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
@@ -22,23 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -49,9 +47,9 @@
 public class AMD64MathSignumOp extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64MathSignumOp.class);
 
-    @Def({REG, HINT}) protected Value result;
-    @Use({REG}) protected Value input;
-    @Temp({REG}) protected Value scratch;
+    @Def({OperandFlag.REG, OperandFlag.HINT}) protected Value result;
+    @Use({OperandFlag.REG}) protected Value input;
+    @Temp({OperandFlag.REG}) protected Value scratch;
 
     public AMD64MathSignumOp(LIRGeneratorTool tool, Value result, AllocatableValue input) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
index af989707ff21..968061839717 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathSinOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
index 6813e52466e8..c93b83ea8ee7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MathTanOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
@@ -24,7 +24,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.pointerConstant;
+import static jdk.compiler.graal.lir.amd64.AMD64LIRHelper.recordExternalAddress;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Move.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
index 4b015b14509c..103d89eb9e3d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Move.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
@@ -22,46 +22,36 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED;
-import static org.graalvm.compiler.lir.LIRValueUtil.asJavaConstant;
-import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MIOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.DataPointerConstant;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.StandardOp.NullCheck;
-import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -75,7 +65,7 @@
 
 public class AMD64Move {
 
-    private abstract static class AbstractMoveOp extends AMD64LIRInstruction implements ValueMoveOp {
+    private abstract static class AbstractMoveOp extends AMD64LIRInstruction implements StandardOp.ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AbstractMoveOp.class);
 
         private AMD64Kind moveKind;
@@ -95,8 +85,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static final class MoveToRegOp extends AbstractMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveToRegOp.class);
 
-        @Def({REG, STACK, HINT}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue input;
+        @Def({OperandFlag.REG, OperandFlag.STACK, OperandFlag.HINT}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue input;
 
         public MoveToRegOp(AMD64Kind moveKind, AllocatableValue result, AllocatableValue input) {
             super(TYPE, moveKind);
@@ -119,8 +109,8 @@ public AllocatableValue getResult() {
     public static final class MoveFromRegOp extends AbstractMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveFromRegOp.class);
 
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG, HINT}) protected AllocatableValue input;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.HINT}) protected AllocatableValue input;
 
         public MoveFromRegOp(AMD64Kind moveKind, AllocatableValue result, AllocatableValue input) {
             super(TYPE, moveKind);
@@ -140,10 +130,10 @@ public AllocatableValue getResult() {
     }
 
     @Opcode("MOVE")
-    public static class MoveFromConstOp extends AMD64LIRInstruction implements LoadConstantOp {
+    public static class MoveFromConstOp extends AMD64LIRInstruction implements StandardOp.LoadConstantOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveFromConstOp.class);
 
-        @Def({REG, STACK}) protected AllocatableValue result;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
         private final JavaConstant input;
 
         public MoveFromConstOp(AllocatableValue result, JavaConstant input) {
@@ -174,11 +164,11 @@ public AllocatableValue getResult() {
     }
 
     @Opcode("STACKMOVE")
-    public static final class AMD64StackMove extends AMD64LIRInstruction implements ValueMoveOp {
+    public static final class AMD64StackMove extends AMD64LIRInstruction implements StandardOp.ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64StackMove.class);
 
-        @Def({STACK}) protected AllocatableValue result;
-        @Use({STACK, HINT}) protected AllocatableValue input;
+        @Def({OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.STACK, OperandFlag.HINT}) protected AllocatableValue input;
         @Alive({OperandFlag.STACK, OperandFlag.UNINITIALIZED}) private AllocatableValue backupSlot;
 
         private Register scratch;
@@ -231,8 +221,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static final class AMD64MultiStackMove extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64MultiStackMove.class);
 
-        @Def({STACK}) protected AllocatableValue[] results;
-        @Use({STACK}) protected Value[] inputs;
+        @Def({OperandFlag.STACK}) protected AllocatableValue[] results;
+        @Use({OperandFlag.STACK}) protected Value[] inputs;
         @Alive({OperandFlag.STACK, OperandFlag.UNINITIALIZED}) private AllocatableValue backupSlot;
 
         private Register scratch;
@@ -268,11 +258,11 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     }
 
     @Opcode("STACKMOVE")
-    public static final class AMD64PushPopStackMove extends AMD64LIRInstruction implements ValueMoveOp {
+    public static final class AMD64PushPopStackMove extends AMD64LIRInstruction implements StandardOp.ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64PushPopStackMove.class);
 
-        @Def({STACK}) protected AllocatableValue result;
-        @Use({STACK, HINT}) protected AllocatableValue input;
+        @Def({OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.STACK, OperandFlag.HINT}) protected AllocatableValue input;
         private final OperandSize size;
 
         public AMD64PushPopStackMove(OperandSize size, AllocatableValue result, AllocatableValue input) {
@@ -302,8 +292,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static final class LeaOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(LeaOp.class);
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({COMPOSITE, UNINITIALIZED}) protected AMD64AddressValue address;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.COMPOSITE, OperandFlag.UNINITIALIZED}) protected AMD64AddressValue address;
         private final OperandSize size;
 
         public LeaOp(AllocatableValue result, AMD64AddressValue address, OperandSize size) {
@@ -327,7 +317,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static final class LeaDataOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(LeaDataOp.class);
 
-        @Def({REG}) protected AllocatableValue result;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
         private final DataPointerConstant data;
 
         public LeaDataOp(AllocatableValue result, DataPointerConstant data) {
@@ -345,8 +335,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static final class StackLeaOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(StackLeaOp.class);
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({STACK, UNINITIALIZED}) protected AllocatableValue slot;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.STACK, OperandFlag.UNINITIALIZED}) protected AllocatableValue slot;
 
         public StackLeaOp(AllocatableValue result, AllocatableValue slot) {
             super(TYPE);
@@ -377,10 +367,10 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
         }
     }
 
-    public static final class NullCheckOp extends AMD64LIRInstruction implements NullCheck {
+    public static final class NullCheckOp extends AMD64LIRInstruction implements StandardOp.NullCheck {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(NullCheckOp.class);
 
-        @Use({COMPOSITE}) protected AMD64AddressValue address;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue address;
         @State protected LIRFrameState state;
 
         public NullCheckOp(AMD64AddressValue address, LIRFrameState state) {
@@ -413,7 +403,7 @@ public static final class CompareAndSwapOp extends AMD64LIRInstruction {
         private final AMD64Kind accessKind;
 
         @Def protected AllocatableValue result;
-        @Use({COMPOSITE}) protected AMD64AddressValue address;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue address;
         @Use protected AllocatableValue cmpValue;
         @Use protected AllocatableValue newValue;
 
@@ -459,7 +449,7 @@ public static final class AtomicReadAndAddOp extends AMD64LIRInstruction {
         private final AMD64Kind accessKind;
 
         @Def protected AllocatableValue result;
-        @Alive({COMPOSITE}) protected AMD64AddressValue address;
+        @Alive({OperandFlag.COMPOSITE}) protected AMD64AddressValue address;
         @Use protected AllocatableValue delta;
 
         public AtomicReadAndAddOp(AMD64Kind accessKind, AllocatableValue result, AMD64AddressValue address, AllocatableValue delta) {
@@ -502,7 +492,7 @@ public static final class AtomicReadAndWriteOp extends AMD64LIRInstruction {
         private final AMD64Kind accessKind;
 
         @Def protected AllocatableValue result;
-        @Alive({COMPOSITE}) protected AMD64AddressValue address;
+        @Alive({OperandFlag.COMPOSITE}) protected AMD64AddressValue address;
         @Use protected AllocatableValue newValue;
 
         public AtomicReadAndWriteOp(AMD64Kind accessKind, AllocatableValue result, AMD64AddressValue address, AllocatableValue newValue) {
@@ -553,12 +543,12 @@ public static void move(AMD64Kind moveKind, CompilationResultBuilder crb, AMD64M
                 stack2reg(moveKind, crb, masm, asRegister(result), input);
                 return;
             }
-        } else if (isJavaConstant(input)) {
+        } else if (LIRValueUtil.isJavaConstant(input)) {
             if (isRegister(result)) {
-                const2reg(crb, masm, asRegister(result), asJavaConstant(input), moveKind);
+                const2reg(crb, masm, asRegister(result), LIRValueUtil.asJavaConstant(input), moveKind);
                 return;
             } else if (isStackSlot(result)) {
-                const2stack(crb, masm, result, asJavaConstant(input));
+                const2stack(crb, masm, result, LIRValueUtil.asJavaConstant(input));
                 return;
             }
         }
@@ -887,9 +877,9 @@ public abstract static class PointerCompressionOp extends AMD64LIRInstruction {
         protected final CompressEncoding encoding;
         protected final boolean nonNull;
 
-        @Def({REG, HINT}) private AllocatableValue result;
-        @Use({REG, CONST}) private Value input;
-        @Alive({REG, ILLEGAL, UNINITIALIZED}) private AllocatableValue baseRegister;
+        @Def({OperandFlag.REG, OperandFlag.HINT}) private AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.CONST}) private Value input;
+        @Alive({OperandFlag.REG, OperandFlag.ILLEGAL, OperandFlag.UNINITIALIZED}) private AllocatableValue baseRegister;
 
         protected PointerCompressionOp(LIRInstructionClass type,
                         AllocatableValue result,
@@ -1061,8 +1051,8 @@ public static void emitUncompressCode(AMD64MacroAssembler masm, Register resReg,
     }
 
     private abstract static class ZeroNullConversionOp extends AMD64LIRInstruction {
-        @Def({REG, HINT}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue input;
+        @Def({OperandFlag.REG, OperandFlag.HINT}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue input;
 
         protected ZeroNullConversionOp(LIRInstructionClass type, AllocatableValue result, AllocatableValue input) {
             super(type);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
index f2ebc9116ce6..44d094d944b0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64MulDivOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
@@ -22,28 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.DIV;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.IDIV;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.IMUL;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp.MUL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -59,20 +58,20 @@ public class AMD64MulDivOp extends AMD64LIRInstruction {
     @Opcode private final AMD64MOp opcode;
     private final OperandSize size;
 
-    @Def({REG}) protected AllocatableValue highResult;
-    @Def({REG}) protected AllocatableValue lowResult;
+    @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected AllocatableValue highResult;
+    @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected AllocatableValue lowResult;
 
-    @Use({REG, ILLEGAL}) protected AllocatableValue highX;
-    @Use({REG}) protected AllocatableValue lowX;
+    @LIRInstruction.Use({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.ILLEGAL}) protected AllocatableValue highX;
+    @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue lowX;
 
     // Even though an idiv instruction can use a memory address for its
     // second operand, HotSpot on Windows does not recognize this form of
     // instruction when handling the special case of MININT/-1:
     // https://github.com/openjdk/jdk/blob/4b0e656bb6a823f50507039df7855183ab98cd83/src/hotspot/os/windows/os_windows.cpp#L2397
     // As such, force the operand to be in a register.
-    @Use({REG}) protected AllocatableValue y;
+    @LIRInstruction.Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue y;
 
-    @State protected LIRFrameState state;
+    @LIRInstruction.State protected LIRFrameState state;
 
     public AMD64MulDivOp(AMD64MOp opcode, OperandSize size, LIRKind resultKind, AllocatableValue x, AllocatableValue y) {
         this(opcode, size, resultKind, Value.ILLEGAL, x, y, null);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64NormalizedUnsignedCompareOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
index c8a93a5ad727..25ff54e58ace 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
@@ -22,18 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -50,9 +49,9 @@
 public class AMD64NormalizedUnsignedCompareOp extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64NormalizedUnsignedCompareOp.class);
 
-    @Def({REG}) protected AllocatableValue result;
-    @Use({REG}) protected AllocatableValue x;
-    @Use({REG}) protected AllocatableValue y;
+    @Def({OperandFlag.REG}) protected AllocatableValue result;
+    @Use({OperandFlag.REG}) protected AllocatableValue x;
+    @Use({OperandFlag.REG}) protected AllocatableValue y;
 
     public AMD64NormalizedUnsignedCompareOp(AllocatableValue result, AllocatableValue x, AllocatableValue y) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
index 44c8bbaa3311..26698f7153aa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64PauseOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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;
 
 /**
  * Emits a pause.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
index 4ca45c190da5..712f0531faec 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64PrefetchOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
@@ -23,20 +23,18 @@
  * questions.
  */
 
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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;
 
 public final class AMD64PrefetchOp extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64PrefetchOp.class);
 
     private final int instr;  // AllocatePrefetchInstr
-    @Alive({COMPOSITE}) protected AMD64AddressValue address;
+    @Alive({OperandFlag.COMPOSITE}) protected AMD64AddressValue address;
 
     public AMD64PrefetchOp(AMD64AddressValue address, int instr) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ReadProcid.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ReadProcid.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
index 5bb76bd878fe..78d727db4402 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ReadProcid.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.meta.AllocatableValue;
 
@@ -43,7 +43,7 @@
 public class AMD64ReadProcid extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64ReadProcid.class);
 
-    @Def({REG}) protected AllocatableValue procidResult;
+    @LIRInstruction.Def({LIRInstruction.OperandFlag.REG}) protected AllocatableValue procidResult;
 
     public AMD64ReadProcid(AllocatableValue dst) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounterWithProcid.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
index 094f38c54474..317b7fec021e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
@@ -22,15 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -45,9 +43,9 @@
 public class AMD64ReadTimestampCounterWithProcid extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64ReadTimestampCounterWithProcid.class);
 
-    @Def({REG}) protected AllocatableValue highResult;
-    @Def({REG}) protected AllocatableValue lowResult;
-    @Def({REG}) protected AllocatableValue procidResult;
+    @Def({OperandFlag.REG}) protected AllocatableValue highResult;
+    @Def({OperandFlag.REG}) protected AllocatableValue lowResult;
+    @Def({OperandFlag.REG}) protected AllocatableValue procidResult;
 
     public AMD64ReadTimestampCounterWithProcid() {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
index 9dd585407b12..9e0e6cc74ef3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64RestoreRegistersOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
 import java.util.Arrays;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.LIRValueUtil;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -52,7 +52,7 @@ public class AMD64RestoreRegistersOp extends AMD64LIRInstruction implements Stan
     /**
      * The slots from which the registers are restored.
      */
-    @Use(STACK) protected final AllocatableValue[] slots;
+    @LIRInstruction.Use(LIRInstruction.OperandFlag.STACK) protected final AllocatableValue[] slots;
 
     /**
      * The operation that saved the registers restored by this operation.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
index 59172713dd9b..e332cd21b6f9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64RoundFloatToIntegerOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
@@ -22,21 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -57,11 +55,11 @@
 public class AMD64RoundFloatToIntegerOp extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64RoundFloatToIntegerOp.class);
 
-    @Def({REG, HINT}) protected AllocatableValue result;
-    @Use({REG}) protected AllocatableValue input;
+    @Def({OperandFlag.REG, OperandFlag.HINT}) protected AllocatableValue result;
+    @Use({OperandFlag.REG}) protected AllocatableValue input;
 
-    @Temp({REG}) protected AllocatableValue tmp;
-    @Temp({REG}) protected AllocatableValue rcxTmp;
+    @Temp({OperandFlag.REG}) protected AllocatableValue tmp;
+    @Temp({OperandFlag.REG}) protected AllocatableValue rcxTmp;
 
     public AMD64RoundFloatToIntegerOp(LIRGeneratorTool tool, AllocatableValue result, AllocatableValue input) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA1Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA1Op.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
index d079bdaf3df0..59871fb4ac49 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA1Op.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 import static jdk.vm.ci.amd64.AMD64.xmm1;
@@ -35,21 +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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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 jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -66,16 +64,16 @@ public final class AMD64SHA1Op extends AMD64LIRInstruction {
 
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64SHA1Op.class);
 
-    @Alive({REG}) private Value bufValue;
-    @Alive({REG}) private Value stateValue;
-    @Alive({REG, ILLEGAL}) private Value ofsValue;
-    @Alive({REG, ILLEGAL}) private Value limitValue;
+    @Alive({OperandFlag.REG}) private Value bufValue;
+    @Alive({OperandFlag.REG}) private Value stateValue;
+    @Alive({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsValue;
+    @Alive({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value limitValue;
 
-    @Def({REG, ILLEGAL}) private Value resultValue;
+    @Def({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value resultValue;
 
-    @Temp({REG, ILLEGAL}) private Value bufTempValue;
-    @Temp({REG, ILLEGAL}) private Value ofsTempValue;
-    @Temp({REG}) private Value[] temps;
+    @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value bufTempValue;
+    @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsTempValue;
+    @Temp({OperandFlag.REG}) private Value[] temps;
     private final boolean multiBlock;
 
     public AMD64SHA1Op(LIRGeneratorTool tool, AllocatableValue bufValue, AllocatableValue stateValue) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA256AVX2Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA256AVX2Op.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
index 5527912d9338..a2173de09743 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA256AVX2Op.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -55,25 +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 org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Above;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.AboveEqual;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Below;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -87,13 +85,13 @@ public final class AMD64SHA256AVX2Op extends AMD64LIRInstruction {
 
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64SHA256AVX2Op.class);
 
-    @Use({REG}) private Value bufValue;
-    @Use({REG}) private Value stateValue;
+    @Use({OperandFlag.REG}) private Value bufValue;
+    @Use({OperandFlag.REG}) private Value stateValue;
 
-    @Use({REG, ILLEGAL}) private Value ofsValue;
-    @Use({REG, ILLEGAL}) private Value limitValue;
+    @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsValue;
+    @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value limitValue;
 
-    @Temp({REG}) private Value[] temps;
+    @Temp({OperandFlag.REG}) private Value[] temps;
 
     private final boolean multiBlock;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA256Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA256Op.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
index a42aee87e305..4a54800423db 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA256Op.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.xmm0;
 import static jdk.vm.ci.amd64.AMD64.xmm1;
@@ -36,21 +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 org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.BelowEqual;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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 jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -67,17 +65,17 @@ public final class AMD64SHA256Op extends AMD64LIRInstruction {
 
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64SHA256Op.class);
 
-    @Alive({REG}) private Value bufValue;
-    @Alive({REG}) private Value stateValue;
-    @Alive({REG, ILLEGAL}) private Value ofsValue;
-    @Alive({REG, ILLEGAL}) private Value limitValue;
+    @Alive({OperandFlag.REG}) private Value bufValue;
+    @Alive({OperandFlag.REG}) private Value stateValue;
+    @Alive({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsValue;
+    @Alive({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value limitValue;
 
-    @Def({REG, ILLEGAL}) private Value resultValue;
+    @Def({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value resultValue;
 
-    @Temp({REG, ILLEGAL}) private Value bufTempValue;
-    @Temp({REG, ILLEGAL}) private Value ofsTempValue;
-    @Temp({REG}) private Value keyTempValue;
-    @Temp({REG}) private Value[] temps;
+    @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value bufTempValue;
+    @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsTempValue;
+    @Temp({OperandFlag.REG}) private Value keyTempValue;
+    @Temp({OperandFlag.REG}) private Value[] temps;
 
     private final boolean multiBlock;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA512Op.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA512Op.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
index a87ad4e200af..3abc6c6fe798 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SHA512Op.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.r10;
 import static jdk.vm.ci.amd64.AMD64.r11;
@@ -52,23 +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 org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.AboveEqual;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.Equal;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag.NotEqual;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
-
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.code.Register;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -84,13 +82,13 @@ public final class AMD64SHA512Op extends AMD64LIRInstruction {
 
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64SHA512Op.class);
 
-    @Use({REG}) private Value bufValue;
-    @Use({REG}) private Value stateValue;
+    @Use({OperandFlag.REG}) private Value bufValue;
+    @Use({OperandFlag.REG}) private Value stateValue;
 
-    @Use({REG, ILLEGAL}) private Value ofsValue;
-    @Use({REG, ILLEGAL}) private Value limitValue;
+    @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value ofsValue;
+    @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value limitValue;
 
-    @Temp({REG}) private Value[] temps;
+    @Temp({OperandFlag.REG}) private Value[] temps;
 
     private final boolean multiBlock;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
index ee4cbcfe3ad3..9b221ba8eafb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SaveRegistersOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp.SaveRegistersOp;
-import org.graalvm.compiler.lir.amd64.vector.AMD64VectorMove;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import jdk.compiler.graal.asm.amd64.AMD64MacroAssembler;
+import jdk.compiler.graal.lir.amd64.vector.AMD64VectorMove;
 
 import jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -44,7 +44,7 @@
  * Saves registers to stack slots.
  */
 @Opcode("SAVE_REGISTER")
-public class AMD64SaveRegistersOp extends SaveRegistersOp {
+public class AMD64SaveRegistersOp extends StandardOp.SaveRegistersOp {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64SaveRegistersOp.class);
 
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
index 144318c63a7b..f84dd718371d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ShiftOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
@@ -22,19 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -49,9 +46,9 @@ public class AMD64ShiftOp extends AMD64LIRInstruction {
     @Opcode private final AMD64MOp opcode;
     private final OperandSize size;
 
-    @Def({REG, HINT}) protected AllocatableValue result;
-    @Use({REG, STACK}) protected AllocatableValue x;
-    @Alive({REG}) protected AllocatableValue y;
+    @Def({OperandFlag.REG, OperandFlag.HINT}) protected AllocatableValue result;
+    @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue x;
+    @Alive({OperandFlag.REG}) protected AllocatableValue y;
 
     public AMD64ShiftOp(AMD64MOp opcode, OperandSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
index 6b9927a29a6c..7a88a6b7f7ff 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64SignExtendOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
@@ -22,19 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
-import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
+import static jdk.compiler.graal.asm.amd64.AMD64BaseAssembler.OperandSize.QWORD;
 
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -45,10 +44,10 @@ public class AMD64SignExtendOp extends AMD64LIRInstruction {
 
     private final OperandSize size;
 
-    @Def({REG}) protected AllocatableValue highResult;
-    @Def({REG}) protected AllocatableValue lowResult;
+    @Def({OperandFlag.REG}) protected AllocatableValue highResult;
+    @Def({OperandFlag.REG}) protected AllocatableValue lowResult;
 
-    @Use({REG}) protected AllocatableValue input;
+    @Use({OperandFlag.REG}) protected AllocatableValue input;
 
     public AMD64SignExtendOp(OperandSize size, LIRKind resultKind, AllocatableValue input) {
         super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
index f1cb9a860f46..07483e72a5c3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64StringLatin1InflateOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
@@ -22,29 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.k2;
 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
@@ -60,18 +58,18 @@ public final class AMD64StringLatin1InflateOp extends AMD64ComplexVectorOp {
 
     private final int useAVX3Threshold;
 
-    @Use({REG}) private Value rsrc;
-    @Use({REG}) private Value rdst;
-    @Use({REG}) private Value rlen;
+    @Use({OperandFlag.REG}) private Value rsrc;
+    @Use({OperandFlag.REG}) private Value rdst;
+    @Use({OperandFlag.REG}) private Value rlen;
 
-    @Temp({REG}) private Value rsrcTemp;
-    @Temp({REG}) private Value rdstTemp;
-    @Temp({REG}) private Value rlenTemp;
+    @Temp({OperandFlag.REG}) private Value rsrcTemp;
+    @Temp({OperandFlag.REG}) private Value rdstTemp;
+    @Temp({OperandFlag.REG}) private Value rlenTemp;
 
-    @Temp({REG}) private Value vtmp1;
-    @Temp({REG}) private Value rtmp2;
+    @Temp({OperandFlag.REG}) private Value vtmp1;
+    @Temp({OperandFlag.REG}) private Value rtmp2;
 
-    @Temp({REG, ILLEGAL}) private Value maskRegister;
+    @Temp({OperandFlag.REG, OperandFlag.ILLEGAL}) private Value maskRegister;
 
     public AMD64StringLatin1InflateOp(LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures, int useAVX3Threshold, Value src, Value dst, Value len) {
         super(TYPE, tool, runtimeCheckedCPUFeatures,
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
index 6b14123e77bd..7355fec0dcc8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64StringUTF16CompressOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64.k2;
 import static jdk.vm.ci.amd64.AMD64.k3;
@@ -32,22 +32,21 @@
 import static jdk.vm.ci.amd64.AMD64.rsi;
 import static jdk.vm.ci.amd64.AMD64.rsp;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXComparisonPredicate;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
@@ -63,22 +62,22 @@ public final class AMD64StringUTF16CompressOp extends AMD64ComplexVectorOp {
 
     private final int useAVX3Threshold;
 
-    @Def({REG}) private Value rres;
-    @Use({REG}) private Value rsrc;
-    @Use({REG}) private Value rdst;
-    @Use({REG}) private Value rlen;
+    @Def({OperandFlag.REG}) private Value rres;
+    @Use({OperandFlag.REG}) private Value rsrc;
+    @Use({OperandFlag.REG}) private Value rdst;
+    @Use({OperandFlag.REG}) private Value rlen;
 
-    @Temp({REG}) private Value rsrcTemp;
-    @Temp({REG}) private Value rdstTemp;
-    @Temp({REG}) private Value rlenTemp;
+    @Temp({OperandFlag.REG}) private Value rsrcTemp;
+    @Temp({OperandFlag.REG}) private Value rdstTemp;
+    @Temp({OperandFlag.REG}) private Value rlenTemp;
 
-    @Temp({REG}) private Value vtmp1;
-    @Temp({REG}) private Value vtmp2;
-    @Temp({REG}) private Value vtmp3;
-    @Temp({REG}) private Value vtmp4;
-    @Temp({REG}) private Value rtmp5;
+    @Temp({OperandFlag.REG}) private Value vtmp1;
+    @Temp({OperandFlag.REG}) private Value vtmp2;
+    @Temp({OperandFlag.REG}) private Value vtmp3;
+    @Temp({OperandFlag.REG}) private Value vtmp4;
+    @Temp({OperandFlag.REG}) private Value rtmp5;
 
-    @Temp({REG}) private Value[] maskRegisters;
+    @Temp({OperandFlag.REG}) private Value[] maskRegisters;
 
     public AMD64StringUTF16CompressOp(LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures, int useAVX3Threshold, Value res, Value src, Value dst, Value len) {
         super(TYPE, tool, runtimeCheckedCPUFeatures,
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Ternary.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Ternary.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
index fbc2937e74c6..97c74ebeae32 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Ternary.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
@@ -22,23 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.vector.AMD64VectorInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.meta.AllocatableValue;
 
@@ -55,14 +53,14 @@ public static class ThreeOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRVMOp opcode;
 
-        @Def({REG, HINT}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue x;
+        @Def({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.HINT}) protected AllocatableValue result;
+        @Use({LIRInstruction.OperandFlag.REG}) protected AllocatableValue x;
         /**
          * This argument must be Alive to ensure that result and y are not assigned to the same
          * register, which would break the code generation by destroying y too early.
          */
-        @Alive({REG}) protected AllocatableValue y;
-        @Alive({REG, STACK}) protected AllocatableValue z;
+        @Alive({LIRInstruction.OperandFlag.REG}) protected AllocatableValue y;
+        @Alive({LIRInstruction.OperandFlag.REG, LIRInstruction.OperandFlag.STACK}) protected AllocatableValue z;
 
         public ThreeOp(VexRVMOp opcode, AVXSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y, AllocatableValue z) {
             super(TYPE, size);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
index f62799fe849f..b2ba534f8330 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64Unary.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
@@ -22,27 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MROp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64RMOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp.ImplicitNullCheck;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+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.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Value;
@@ -61,8 +57,8 @@ public static class MOp extends AMD64LIRInstruction {
         @Opcode private final AMD64MOp opcode;
         private final OperandSize size;
 
-        @Def({REG, HINT}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue value;
+        @Def({OperandFlag.REG, OperandFlag.HINT}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue value;
 
         public MOp(AMD64MOp opcode, OperandSize size, AllocatableValue result, AllocatableValue value) {
             super(TYPE);
@@ -89,8 +85,8 @@ public static class RMOp extends AMD64LIRInstruction {
         @Opcode private final AMD64RMOp opcode;
         private final OperandSize size;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue value;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue value;
 
         public RMOp(AMD64RMOp opcode, OperandSize size, AllocatableValue result, AllocatableValue value) {
             super(TYPE);
@@ -121,8 +117,8 @@ public static class MROp extends AMD64LIRInstruction {
         @Opcode private final AMD64MROp opcode;
         private final OperandSize size;
 
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue value;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue value;
 
         public MROp(AMD64MROp opcode, OperandSize size, AllocatableValue result, AllocatableValue value) {
             super(TYPE);
@@ -147,14 +143,14 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     /**
      * Instruction with a {@link AMD64AddressValue memory} operand.
      */
-    public static class MemoryOp extends AMD64LIRInstruction implements ImplicitNullCheck {
+    public static class MemoryOp extends AMD64LIRInstruction implements StandardOp.ImplicitNullCheck {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MemoryOp.class);
 
         @Opcode private final AMD64RMOp opcode;
         private final OperandSize size;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({COMPOSITE}) protected AMD64AddressValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue input;
 
         @State protected LIRFrameState state;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64UnaryConsumer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64UnaryConsumer.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
index 90f4ae8ecc4f..ac59d1803495 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64UnaryConsumer.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
@@ -22,16 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.AMD64MOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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;
 
 /**
  * AMD64 LIR instructions that have one input and no output.
@@ -44,7 +42,7 @@ public static class MemoryOp extends AMD64LIRInstruction {
         @Opcode private final AMD64MOp opcode;
         private final OperandSize size;
 
-        @Use({COMPOSITE}) protected AMD64AddressValue value;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue value;
 
         public MemoryOp(AMD64MOp opcode, OperandSize size, AMD64AddressValue value) {
             super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
index 887ebd887405..bca87402d544 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VZeroUpper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
@@ -30,11 +30,10 @@
 import java.util.ArrayList;
 import java.util.BitSet;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64Call.ForeignCallOp;
-import org.graalvm.compiler.lir.amd64.vector.AMD64VectorInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.Register;
@@ -55,9 +54,9 @@
  * instruction (see {@code AMD64HotSpotReturnOp.emitCode}) upon returning, if the current LIR graph
  * contains LIR operations that touch the upper bits of the YMM registers, including but not limited
  * to {@link AMD64VectorInstruction}, {@link AMD64ArrayCompareToOp}, {@link AMD64ArrayEqualsOp},
- * {@link AMD64ArrayIndexOfOp}, and {@link ForeignCallOp} that invokes to Graal-compiled stubs. For
- * the last case, since Graal-compiled stubs is under our control, we don't emit vzeroupper upon
- * returning of the stub, but rather do that upon returning of the current method.
+ * {@link AMD64ArrayIndexOfOp}, and {@link AMD64Call.ForeignCallOp} that invokes to Graal-compiled
+ * stubs. For the last case, since Graal-compiled stubs is under our control, we don't emit
+ * vzeroupper upon returning of the stub, but rather do that upon returning of the current method.
  *
  * On JDK8, C2 does not emit many vzeroupper instructions, potentially because that YMM registers
  * are not heavily employed (C2 vectorization starts using YMM registers in 9, source
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
index 4061bc464786..1506e9db6aa8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VectorizedHashCodeOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
@@ -22,52 +22,51 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
 import static jdk.vm.ci.amd64.AMD64Kind.QWORD;
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI128;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU32;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPBROADCASTD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXBW;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXDQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXWD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVSXWQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXBW;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXDQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXWD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp.VPMOVZXWQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPADDB;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPADDD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPADDW;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPHADDD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPMULLD;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.ZMM;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.pointerConstant;
-import static org.graalvm.compiler.lir.amd64.AMD64LIRHelper.recordExternalAddress;
+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 java.util.EnumSet;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.ArrayDataPointerConstant;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.code.Register;
@@ -87,15 +86,15 @@
 public final class AMD64VectorizedHashCodeOp extends AMD64ComplexVectorOp {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64VectorizedHashCodeOp.class);
 
-    @Def({REG}) private Value resultValue;
-    @Alive({REG}) private Value arrayStart;
-    @Alive({REG}) private Value length;
-    @Alive({REG}) private Value initialValue;
+    @Def({OperandFlag.REG}) private Value resultValue;
+    @Alive({OperandFlag.REG}) private Value arrayStart;
+    @Alive({OperandFlag.REG}) private Value length;
+    @Alive({OperandFlag.REG}) private Value initialValue;
 
     private final JavaKind arrayKind;
 
-    @Temp({REG}) Value[] temp;
-    @Temp({REG}) Value[] vectorTemp;
+    @Temp({OperandFlag.REG}) Value[] temp;
+    @Temp({OperandFlag.REG}) Value[] vectorTemp;
 
     public AMD64VectorizedHashCodeOp(LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures,
                     AllocatableValue result, AllocatableValue arrayStart, AllocatableValue length, AllocatableValue initialValue, JavaKind arrayKind) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VectorizedMismatchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VectorizedMismatchOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
index acb8c6b64561..ae85c265bf27 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64VectorizedMismatchOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
@@ -22,33 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.DWORD;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.QWORD;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.YMM;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+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 java.util.EnumSet;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.SyncPort;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -77,18 +76,18 @@ public final class AMD64VectorizedMismatchOp extends AMD64ComplexVectorOp {
     private static final int ONES_16 = 0xffff;
     private static final int ONES_32 = 0xffffffff;
 
-    @Def({REG}) private Value resultValue;
-    @Use({REG}) private Value arrayAValue;
-    @Use({REG}) private Value arrayBValue;
-    @Use({REG}) private Value lengthValue;
-    @Alive({REG}) private Value strideValue;
+    @Def({OperandFlag.REG}) private Value resultValue;
+    @Use({OperandFlag.REG}) private Value arrayAValue;
+    @Use({OperandFlag.REG}) private Value arrayBValue;
+    @Use({OperandFlag.REG}) private Value lengthValue;
+    @Alive({OperandFlag.REG}) private Value strideValue;
 
-    @Temp({REG}) private Value arrayAValueTemp;
-    @Temp({REG}) private Value arrayBValueTemp;
-    @Temp({REG}) private Value lengthValueTemp;
+    @Temp({OperandFlag.REG}) private Value arrayAValueTemp;
+    @Temp({OperandFlag.REG}) private Value arrayBValueTemp;
+    @Temp({OperandFlag.REG}) private Value lengthValueTemp;
 
-    @Temp({REG}) Value[] temp;
-    @Temp({REG}) Value[] vectorTemp;
+    @Temp({OperandFlag.REG}) Value[] temp;
+    @Temp({OperandFlag.REG}) Value[] vectorTemp;
 
     private AMD64VectorizedMismatchOp(LIRGeneratorTool tool, EnumSet runtimeCheckedCPUFeatures,
                     Value result, Value arrayA, Value arrayB, Value length, Value stride) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
index 935066a7bc04..38de91e210bb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZapRegistersOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
index 9bca406939db..26e389a405d2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZapStackOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.code.StackSlot;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZeroMemoryOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZeroMemoryOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
index 461e63800055..f559ef2d93a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/AMD64ZeroMemoryOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
@@ -22,16 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -46,8 +43,8 @@ public final class AMD64ZeroMemoryOp extends AMD64LIRInstruction {
 
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64ZeroMemoryOp.class);
 
-    @Use({COMPOSITE}) protected AMD64AddressValue pointer;
-    @Use({REG}) protected RegisterValue length;
+    @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue pointer;
+    @Use({OperandFlag.REG}) protected RegisterValue length;
 
     @Temp protected Value pointerTemp;
     @Temp protected Value valueTemp;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/EndbranchOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/EndbranchOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
index fbf06d2a333d..8d86b07c68ac 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/EndbranchOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64;
+package jdk.compiler.graal.lir.amd64;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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;
 
 @Opcode("ENDBR64")
 public final class EndbranchOp extends AMD64LIRInstruction {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
index 7b7fe917b711..03abdd982b20 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/phases/StackMoveOptimizationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
@@ -22,27 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.phases;
-
-import static org.graalvm.compiler.lir.phases.LIRPhase.Options.LIROptimization;
+package jdk.compiler.graal.lir.amd64.phases;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.RedundantMoveElimination;
-import org.graalvm.compiler.lir.amd64.AMD64Move.AMD64MultiStackMove;
-import org.graalvm.compiler.lir.amd64.AMD64Move.AMD64StackMove;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase;
-import org.graalvm.compiler.options.NestedBooleanOptionKey;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+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.vm.ci.code.Register;
 import jdk.vm.ci.code.TargetDescription;
@@ -50,17 +48,18 @@
 import jdk.vm.ci.meta.Value;
 
 /**
- * Replaces sequential {@link AMD64StackMove}s of the same type with a single
- * {@link AMD64MultiStackMove} to avoid storing/restoring the scratch register multiple times.
+ * Replaces sequential {@link AMD64Move.AMD64StackMove}s of the same type with a single
+ * {@link AMD64Move.AMD64MultiStackMove} to avoid storing/restoring the scratch register multiple
+ * times.
  *
  * Note: this phase must be inserted after {@link RedundantMoveElimination} phase because
- * {@link AMD64MultiStackMove} are not probably detected.
+ * {@link AMD64Move.AMD64MultiStackMove} are not probably detected.
  */
 public class StackMoveOptimizationPhase extends PostAllocationOptimizationPhase {
     public static class Options {
         // @formatter:off
         @Option(help = "", type = OptionType.Debug)
-        public static final NestedBooleanOptionKey LIROptStackMoveOptimizer = new NestedBooleanOptionKey(LIROptimization, true);
+        public static final NestedBooleanOptionKey LIROptStackMoveOptimizer = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true);
         // @formatter:on
     }
 
@@ -91,7 +90,7 @@ public void process(DebugContext debug, List instructions) {
                 LIRInstruction inst = instructions.get(i);
 
                 if (isStackMove(inst)) {
-                    AMD64StackMove move = asStackMove(inst);
+                    AMD64Move.AMD64StackMove move = asStackMove(inst);
 
                     if (reg != null && !reg.equals(move.getScratchRegister())) {
                         // end of trace & start of new
@@ -130,7 +129,7 @@ public void process(DebugContext debug, List instructions) {
         private void replaceStackMoves(DebugContext debug, List instructions) {
             int size = dst.size();
             if (size > 1) {
-                AMD64MultiStackMove multiMove = new AMD64MultiStackMove(dst.toArray(new AllocatableValue[size]), src.toArray(new AllocatableValue[size]), reg, slot);
+                AMD64Move.AMD64MultiStackMove multiMove = new AMD64Move.AMD64MultiStackMove(dst.toArray(new AllocatableValue[size]), src.toArray(new AllocatableValue[size]), reg, slot);
                 // replace first instruction
                 instructions.set(begin, multiMove);
                 // and null out others
@@ -148,13 +147,13 @@ private void replaceStackMoves(DebugContext debug, List instruct
         }
     }
 
-    private static AMD64StackMove asStackMove(LIRInstruction inst) {
+    private static AMD64Move.AMD64StackMove asStackMove(LIRInstruction inst) {
         assert isStackMove(inst);
-        return (AMD64StackMove) inst;
+        return (AMD64Move.AMD64StackMove) inst;
     }
 
     private static boolean isStackMove(LIRInstruction inst) {
-        return inst instanceof AMD64StackMove;
+        return inst instanceof AMD64Move.AMD64StackMove;
     }
 
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorBinary.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorBinary.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
index e8887d461af1..57b506e8a054 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorBinary.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
@@ -22,27 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PD;
-import static org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.PS;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRRIOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64AddressValue;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -54,9 +51,9 @@ public static final class AVXBinaryOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRVMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue x;
-        @Use({REG, STACK}) protected AllocatableValue y;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue x;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue y;
 
         public AVXBinaryOp(VexRVMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y) {
             super(TYPE, size);
@@ -82,8 +79,8 @@ public static final class AVXBinaryConstOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRRIOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue x;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue x;
         protected int y;
 
         public AVXBinaryConstOp(VexRRIOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue x, int y) {
@@ -107,8 +104,8 @@ public static final class AVXBinaryConstFloatOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRVMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue x;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue x;
         protected ConstantValue y;
 
         public AVXBinaryConstFloatOp(VexRVMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue x, ConstantValue y) {
@@ -136,9 +133,9 @@ public static final class AVXBinaryMemoryOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRVMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue x;
-        @Use({COMPOSITE}) protected AMD64AddressValue y;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue x;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue y;
         @State protected LIRFrameState state;
 
         public AVXBinaryMemoryOp(VexRVMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue x, AMD64AddressValue y, LIRFrameState state) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorBlend.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorBlend.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
index 5458a95511b1..9fc3ce2ed752 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorBlend.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
@@ -22,21 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+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.vm.ci.meta.AllocatableValue;
 
@@ -46,10 +44,10 @@ private abstract static class AbstractBlendOp extends AMD64LIRInstruction {
 
         protected final AVXKind.AVXSize size;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue x;
-        @Use({REG, STACK}) protected AllocatableValue y;
-        @Use({REG}) protected AllocatableValue mask;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue x;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue y;
+        @Use({OperandFlag.REG}) protected AllocatableValue mask;
 
         AbstractBlendOp(LIRInstructionClass c, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y, AllocatableValue mask) {
             super(c);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorClearOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorClearOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
index cd4016bc9c8d..c468d2332e74 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorClearOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
@@ -22,21 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPS;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+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 org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -45,7 +43,7 @@
 public class AMD64VectorClearOp extends AMD64LIRInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64VectorClearOp.class);
 
-    protected @LIRInstruction.Def({REG}) AllocatableValue result;
+    protected @Def({OperandFlag.REG}) AllocatableValue result;
 
     public AMD64VectorClearOp(AllocatableValue result) {
         this(TYPE, result);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorCompareOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorCompareOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
index 9bfc84565e65..279b9ad15216 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorCompareOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
@@ -22,20 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.meta.AllocatableValue;
 
@@ -43,8 +41,8 @@ public final class AMD64VectorCompareOp extends AMD64VectorInstruction {
     public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AMD64VectorCompareOp.class);
 
     @Opcode private final VexRMOp opcode;
-    @Use({REG}) protected AllocatableValue x;
-    @Use({REG, STACK}) protected AllocatableValue y;
+    @Use({OperandFlag.REG}) protected AllocatableValue x;
+    @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue y;
 
     public AMD64VectorCompareOp(VexRMOp opcode, AllocatableValue x, AllocatableValue y) {
         this(opcode, AVXSize.XMM, x, y);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorFloatCompareOp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorFloatCompareOp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
index e9efbd8b2cdf..9819e3aacf95 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorFloatCompareOp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
@@ -22,21 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
 
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexFloatCompareOp;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.vm.ci.meta.AllocatableValue;
 
@@ -45,9 +43,9 @@ public class AMD64VectorFloatCompareOp extends AMD64LIRInstruction {
 
     @Opcode private final VexFloatCompareOp opcode;
     private final AVXSize size;
-    @Def({REG}) protected AllocatableValue result;
-    @Use({REG}) protected AllocatableValue x;
-    @Use({REG, STACK}) protected AllocatableValue y;
+    @Def({OperandFlag.REG}) protected AllocatableValue result;
+    @Use({OperandFlag.REG}) protected AllocatableValue x;
+    @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue y;
     private final VexFloatCompareOp.Predicate predicate;
 
     public AMD64VectorFloatCompareOp(VexFloatCompareOp opcode, AVXSize size, AllocatableValue result, AllocatableValue x, AllocatableValue y, VexFloatCompareOp.Predicate predicate) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorGather.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorGather.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
index 5648cb82bf2d..04603cb9a52a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorGather.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
@@ -22,21 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+
+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.vm.ci.meta.AllocatableValue;
 
@@ -45,10 +44,10 @@ private abstract static class AbstractGatherOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AbstractGatherOp.class);
 
         protected final AVXKind.AVXSize size;
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue base;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue base;
         // must be alive to avoid conflict with result
-        @Alive({REG}) protected AllocatableValue index;
+        @Alive({OperandFlag.REG}) protected AllocatableValue index;
 
         AbstractGatherOp(LIRInstructionClass c, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue base, AllocatableValue index) {
             super(c);
@@ -66,8 +65,8 @@ public static class VexVectorGatherOp extends AbstractGatherOp {
 
         @Opcode private final AMD64Assembler.VexGatherOp opcode;
         // both used and killed, must be a fixed register
-        @Use({REG}) protected AllocatableValue mask;
-        @Temp({REG}) protected AllocatableValue maskTemp;
+        @Use({OperandFlag.REG}) protected AllocatableValue mask;
+        @Temp({OperandFlag.REG}) protected AllocatableValue maskTemp;
 
         public VexVectorGatherOp(AMD64Assembler.VexGatherOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue base, AllocatableValue index, AllocatableValue mask) {
             super(TYPE, size, result, base, index);
@@ -93,8 +92,8 @@ public static class EvexVectorGatherOp extends AbstractGatherOp implements AVX51
 
         @Opcode private final AMD64Assembler.EvexGatherOp opcode;
         // both used and killed, must be a fixed register
-        @Use({REG}) protected AllocatableValue mask;
-        @Temp({REG}) protected AllocatableValue maskTemp;
+        @Use({OperandFlag.REG}) protected AllocatableValue mask;
+        @Temp({OperandFlag.REG}) protected AllocatableValue maskTemp;
 
         public EvexVectorGatherOp(AMD64Assembler.EvexGatherOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue base, AllocatableValue index, AllocatableValue mask) {
             super(TYPE, size, result, base, index);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorInstruction.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorInstruction.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
index 6c76fee4806f..815071bdbd29 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorInstruction.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
+import jdk.compiler.graal.asm.amd64.AVXKind.AVXSize;
+import jdk.compiler.graal.lir.LIRInstructionClass;
+import jdk.compiler.graal.lir.amd64.AMD64LIRInstruction;
 
 public abstract class AMD64VectorInstruction extends AMD64LIRInstruction {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
index e9104326a91c..164ca23de8f3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorMove.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
@@ -22,43 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU32;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVSD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVSS;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVUPD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVUPS;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VXORPD;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.UNINITIALIZED;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.asm.amd64.AVXKind.AVXSize;
-import org.graalvm.compiler.core.common.type.DataPointerConstant;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
-import org.graalvm.compiler.lir.amd64.AMD64AddressValue;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.amd64.AMD64Move;
-import org.graalvm.compiler.lir.amd64.AMD64RestoreRegistersOp;
-import org.graalvm.compiler.lir.amd64.AMD64SaveRegistersOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 jdk.vm.ci.amd64.AMD64Kind;
 import jdk.vm.ci.code.Register;
@@ -72,11 +66,11 @@
 public class AMD64VectorMove {
 
     @Opcode("VMOVE")
-    public static final class MoveToRegOp extends AMD64LIRInstruction implements ValueMoveOp {
+    public static final class MoveToRegOp extends AMD64LIRInstruction implements StandardOp.ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveToRegOp.class);
 
-        @Def({REG, STACK, HINT}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue input;
+        @Def({OperandFlag.REG, OperandFlag.STACK, OperandFlag.HINT}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue input;
 
         public MoveToRegOp(AllocatableValue result, AllocatableValue input) {
             super(TYPE);
@@ -101,11 +95,11 @@ public AllocatableValue getResult() {
     }
 
     @Opcode("VMOVE")
-    public static final class MoveFromRegOp extends AMD64LIRInstruction implements ValueMoveOp {
+    public static final class MoveFromRegOp extends AMD64LIRInstruction implements StandardOp.ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveFromRegOp.class);
 
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG, HINT}) protected AllocatableValue input;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.HINT}) protected AllocatableValue input;
 
         public MoveFromRegOp(AllocatableValue result, AllocatableValue input) {
             super(TYPE);
@@ -130,10 +124,10 @@ public AllocatableValue getResult() {
     }
 
     @Opcode("VMOVE")
-    public static class MoveFromConstOp extends AMD64LIRInstruction implements LoadConstantOp {
+    public static class MoveFromConstOp extends AMD64LIRInstruction implements StandardOp.LoadConstantOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveFromConstOp.class);
 
-        @Def({REG, STACK}) protected AllocatableValue result;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
         private final JavaConstant input;
 
         public MoveFromConstOp(AllocatableValue result, JavaConstant input) {
@@ -164,10 +158,10 @@ public AllocatableValue getResult() {
     }
 
     @Opcode("VMOVE")
-    public static class MoveFromArrayConstOp extends AMD64LIRInstruction implements LoadConstantOp {
+    public static class MoveFromArrayConstOp extends AMD64LIRInstruction implements StandardOp.LoadConstantOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(MoveFromArrayConstOp.class);
 
-        @Def({REG, STACK}) protected AllocatableValue result;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
         private final DataPointerConstant input;
 
         public MoveFromArrayConstOp(AllocatableValue result, DataPointerConstant input) {
@@ -196,12 +190,12 @@ public AllocatableValue getResult() {
     }
 
     @Opcode("VSTACKMOVE")
-    public static final class StackMoveOp extends AMD64LIRInstruction implements ValueMoveOp {
+    public static final class StackMoveOp extends AMD64LIRInstruction implements StandardOp.ValueMoveOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(StackMoveOp.class);
 
-        @Def({STACK}) protected AllocatableValue result;
-        @Use({STACK, HINT}) protected AllocatableValue input;
-        @Alive({STACK, UNINITIALIZED}) private AllocatableValue backupSlot;
+        @Def({OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.STACK, OperandFlag.HINT}) protected AllocatableValue input;
+        @Alive({OperandFlag.STACK, OperandFlag.UNINITIALIZED}) private AllocatableValue backupSlot;
 
         private Register scratch;
 
@@ -240,7 +234,7 @@ public abstract static class VectorMemOp extends AMD64VectorInstruction {
 
         protected final VexMoveOp op;
 
-        @Use({COMPOSITE}) protected AMD64AddressValue address;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue address;
         @State protected LIRFrameState state;
 
         protected VectorMemOp(LIRInstructionClass c, AVXSize size, VexMoveOp op, AMD64AddressValue address, LIRFrameState state) {
@@ -264,7 +258,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static final class VectorLoadOp extends VectorMemOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(VectorLoadOp.class);
 
-        @Def({REG}) protected AllocatableValue result;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
 
         public VectorLoadOp(AVXSize size, VexMoveOp op, AllocatableValue result, AMD64AddressValue address, LIRFrameState state) {
             super(TYPE, size, op, address, state);
@@ -280,7 +274,7 @@ public void emitMemAccess(AMD64MacroAssembler masm) {
     public static class VectorStoreOp extends VectorMemOp {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(VectorStoreOp.class);
 
-        @Use({REG}) protected AllocatableValue input;
+        @Use({OperandFlag.REG}) protected AllocatableValue input;
 
         public VectorStoreOp(AVXSize size, VexMoveOp op, AMD64AddressValue address, AllocatableValue input, LIRFrameState state) {
             super(TYPE, size, op, address, state);
@@ -445,8 +439,8 @@ public static final class AVXMoveToIntOp extends AMD64LIRInstruction {
 
         @Opcode private final VexMoveOp opcode;
 
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue input;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue input;
 
         public AVXMoveToIntOp(VexMoveOp opcode, AllocatableValue result, AllocatableValue input) {
             super(TYPE);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
index f929e4813730..a0c3415bc560 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorShuffle.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
@@ -22,61 +22,59 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.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 org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF128;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF32X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF32X8;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF64X2;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTF64X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI128;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI32X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI32X8;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI64X2;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VEXTRACTI64X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRB;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp.VPEXTRW;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVDQU64;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMoveOp.VMOVQ;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF128;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF32X8;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF64X2;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTF64X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI128;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI32X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI32X8;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X2;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VINSERTI64X4;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPD;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp.VSHUFPS;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPERMT2B;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPSHUFB;
-import static org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp.VPXOR;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.XMM;
-import static org.graalvm.compiler.asm.amd64.AVXKind.AVXSize.ZMM;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexMRIOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMIOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMIOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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 jdk.vm.ci.amd64.AMD64.CPUFeature;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -88,8 +86,8 @@ public class AMD64VectorShuffle {
     public static final class IntToVectorOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(IntToVectorOp.class);
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue value;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue value;
 
         public IntToVectorOp(AllocatableValue result, AllocatableValue value) {
             super(TYPE);
@@ -111,8 +109,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class LongToVectorOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(LongToVectorOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue value;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue value;
 
         public LongToVectorOp(AllocatableValue result, AllocatableValue value) {
             super(TYPE);
@@ -134,9 +132,9 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class ShuffleBytesOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ShuffleBytesOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source;
-        @Use({REG, STACK}) protected AllocatableValue selector;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue selector;
 
         public ShuffleBytesOp(AllocatableValue result, AllocatableValue source, AllocatableValue selector) {
             super(TYPE);
@@ -159,10 +157,10 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class ConstPermuteBytesUsingTableOp extends AMD64LIRInstruction implements AVX512Support {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ConstPermuteBytesUsingTableOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Alive({REG, STACK}) protected AllocatableValue source;
-        @Use({REG}) protected AllocatableValue mask;
-        @Temp({REG}) protected AllocatableValue selector;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Alive({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue source;
+        @Use({OperandFlag.REG}) protected AllocatableValue mask;
+        @Temp({OperandFlag.REG}) protected AllocatableValue selector;
 
         byte[] selectorData;
 
@@ -201,8 +199,8 @@ public AllocatableValue getOpmask() {
 
     public static final class ConstShuffleBytesOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ConstShuffleBytesOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source;
         private final byte[] selector;
 
         public ConstShuffleBytesOp(AllocatableValue result, AllocatableValue source, byte... selector) {
@@ -226,8 +224,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static class ShuffleWordOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ShuffleWordOp.class);
         protected final VexRMIOp op;
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue source;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue source;
         protected final int selector;
 
         public ShuffleWordOp(VexRMIOp op, AllocatableValue result, AllocatableValue source, int selector) {
@@ -256,7 +254,7 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
     public static class ShuffleWordOpWithMask extends ShuffleWordOp implements AVX512Support {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ShuffleWordOpWithMask.class);
 
-        @Use({REG}) protected AllocatableValue mask;
+        @Use({OperandFlag.REG}) protected AllocatableValue mask;
 
         public ShuffleWordOpWithMask(VexRMIOp op, AllocatableValue result, AllocatableValue source, int selector, AllocatableValue mask) {
             super(TYPE, op, result, source, selector);
@@ -283,9 +281,9 @@ public AllocatableValue getOpmask() {
 
     public static class ShuffleFloatOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ShuffleFloatOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source1;
-        @Use({REG, STACK}) protected AllocatableValue source2;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source1;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue source2;
         private final int selector;
 
         public ShuffleFloatOp(AllocatableValue result, AllocatableValue source1, AllocatableValue source2, int selector) {
@@ -323,8 +321,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class Extract128Op extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(Extract128Op.class);
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source;
         private final int selector;
 
         public Extract128Op(AllocatableValue result, AllocatableValue source, int selector) {
@@ -386,8 +384,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static class Extract256Op extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(Extract256Op.class);
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source;
         private final int selector;
 
         public Extract256Op(AllocatableValue result, AllocatableValue source, int selector) {
@@ -432,9 +430,9 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class Insert128Op extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(Insert128Op.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source1;
-        @Use({REG, STACK}) protected AllocatableValue source2;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source1;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue source2;
         private final int selector;
 
         public Insert128Op(AllocatableValue result, AllocatableValue source1, AllocatableValue source2, int selector) {
@@ -501,9 +499,9 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class Insert256Op extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(Insert256Op.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue source1;
-        @Use({REG, STACK}) protected AllocatableValue source2;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue source1;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue source2;
         private final int selector;
 
         public Insert256Op(AllocatableValue result, AllocatableValue source1, AllocatableValue source2, int selector) {
@@ -547,8 +545,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class ExtractByteOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ExtractByteOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue vector;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue vector;
         private final int selector;
 
         public ExtractByteOp(AllocatableValue result, AllocatableValue vector, int selector) {
@@ -568,8 +566,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class ExtractShortOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ExtractShortOp.class);
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue vector;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue vector;
         private final int selector;
 
         public ExtractShortOp(AllocatableValue result, AllocatableValue vector, int selector) {
@@ -589,8 +587,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class ExtractIntOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ExtractIntOp.class);
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue vector;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue vector;
         private final int selector;
 
         public ExtractIntOp(AllocatableValue result, AllocatableValue vector, int selector) {
@@ -623,8 +621,8 @@ public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
 
     public static final class ExtractLongOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(ExtractLongOp.class);
-        @Def({REG, STACK}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue vector;
+        @Def({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue vector;
         private final int selector;
 
         public ExtractLongOp(AllocatableValue result, AllocatableValue vector, int selector) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorUnary.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorUnary.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
index 90342a3d2a39..fde74b54be43 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AMD64VectorUnary.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
@@ -22,36 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.COMPOSITE;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.CONST;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.STACK;
-import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
-import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
-
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.EvexRMIOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRMOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMConvertOp;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.VexRVMOp;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.EVEXPrefixConfig;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64AddressValue;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64Kind;
@@ -65,8 +59,8 @@ public static final class AVXUnaryOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue input;
 
         public AVXUnaryOp(VexRMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue input) {
             super(TYPE, size);
@@ -90,8 +84,8 @@ public static final class AVXUnaryRVMOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRVMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue input;
 
         public AVXUnaryRVMOp(VexRVMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AllocatableValue input) {
             super(TYPE, size);
@@ -116,8 +110,8 @@ public static final class AVXUnaryMemoryOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({COMPOSITE}) protected AMD64AddressValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue input;
         @State protected LIRFrameState state;
 
         public AVXUnaryMemoryOp(VexRMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AMD64AddressValue input, LIRFrameState state) {
@@ -142,9 +136,9 @@ public static final class AVXBroadcastOp extends AMD64VectorInstruction implemen
 
         @Opcode private final VexRMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK, CONST}) protected Value input;
-        @Use({REG, ILLEGAL}) protected AllocatableValue opmask;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK, OperandFlag.CONST}) protected Value input;
+        @Use({OperandFlag.REG, OperandFlag.ILLEGAL}) protected AllocatableValue opmask;
 
         private final int z;
         private final int b;
@@ -172,9 +166,9 @@ public AllocatableValue getOpmask() {
         public void emitCode(CompilationResultBuilder crb, AMD64MacroAssembler masm) {
             if (isRegister(input)) {
                 opcode.emit(masm, size, asRegister(result), asRegister(input));
-            } else if (isConstantValue(input)) {
+            } else if (LIRValueUtil.isConstantValue(input)) {
                 int align = crb.dataBuilder.ensureValidDataAlignment(input.getPlatformKind().getSizeInBytes());
-                AMD64Address address = (AMD64Address) crb.recordDataReferenceInCode(asConstant(input), align);
+                AMD64Address address = (AMD64Address) crb.recordDataReferenceInCode(LIRValueUtil.asConstant(input), align);
                 opcode.emit(masm, size, asRegister(result), address, getOpmaskRegister(), z, b);
             } else {
                 opcode.emit(masm, size, asRegister(result), (AMD64Address) crb.asAddress(input), getOpmaskRegister(), z, b);
@@ -187,8 +181,8 @@ public static final class AVXConvertMemoryOp extends AMD64VectorInstruction {
 
         @Opcode private final VexRVMOp opcode;
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({COMPOSITE}) protected AMD64AddressValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.COMPOSITE}) protected AMD64AddressValue input;
         @State protected LIRFrameState state;
 
         public AVXConvertMemoryOp(VexRVMOp opcode, AVXKind.AVXSize size, AllocatableValue result, AMD64AddressValue input, LIRFrameState state) {
@@ -212,8 +206,8 @@ public static final class AVXConvertOp extends AMD64LIRInstruction {
         public static final LIRInstructionClass TYPE = LIRInstructionClass.create(AVXConvertOp.class);
 
         @Opcode private final VexRVMConvertOp opcode;
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG, STACK}) protected AllocatableValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG, OperandFlag.STACK}) protected AllocatableValue input;
 
         public AVXConvertOp(VexRVMConvertOp opcode, AllocatableValue result, AllocatableValue input) {
             super(TYPE);
@@ -255,10 +249,10 @@ public static final class FloatPointClassTestOp extends AMD64LIRInstruction {
         public static final int SIG_NAN   = 0b10000000;
         // @formatter:on
 
-        @Def({REG}) protected AllocatableValue result;
-        @Use({REG}) protected AllocatableValue input;
+        @Def({OperandFlag.REG}) protected AllocatableValue result;
+        @Use({OperandFlag.REG}) protected AllocatableValue input;
 
-        @Temp({REG}) protected AllocatableValue maskTemp;
+        @Temp({OperandFlag.REG}) protected AllocatableValue maskTemp;
 
         private final OperandSize size;
         private final int imm8;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AVX512Support.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AVX512Support.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
index ad110764358f..313662b79e7e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/amd64/vector/AVX512Support.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.amd64.vector;
+package jdk.compiler.graal.lir.amd64.vector;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
index 165ddcbd9d24..6a78790bd877 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/ArrayDataPointerConstant.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.asm;
+package jdk.compiler.graal.lir.asm;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.Arrays;
 
-import org.graalvm.compiler.core.common.type.DataPointerConstant;
+import jdk.compiler.graal.core.common.type.DataPointerConstant;
 
 /**
  * Class for chunks of data that go into the data section.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
index a111fe2a048d..3c18380bd1b9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/CompilationResultBuilder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.asm;
+package jdk.compiler.graal.lir.asm;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
-import static org.graalvm.compiler.core.common.GraalOptions.IsolatedLoopHeaderAlignment;
+import static jdk.compiler.graal.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 org.graalvm.compiler.asm.AbstractAddress;
-import org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
-import org.graalvm.compiler.code.CompilationResult.JumpTable;
-import org.graalvm.compiler.code.DataSection.Data;
-import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.type.DataPointerConstant;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.lir.ImplicitLIRFrameState;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionVerifier;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.lir.StandardOp.LabelHoldingOp;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
index 9f1a74b54aee..005426238f7a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/CompilationResultBuilderFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.asm;
+package jdk.compiler.graal.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 org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstructionVerifier;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.Register;
 import jdk.vm.ci.services.Services;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/DataBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/DataBuilder.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/DataBuilder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/DataBuilder.java
index 0dbe1f2d89de..de0860195ff2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/DataBuilder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/DataBuilder.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.asm;
+package jdk.compiler.graal.lir.asm;
 
 import java.nio.ByteBuffer;
 
-import org.graalvm.compiler.code.DataSection;
-import org.graalvm.compiler.code.DataSection.Data;
-import org.graalvm.compiler.code.DataSection.Patches;
-import org.graalvm.compiler.code.DataSection.ZeroData;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.SerializableConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/EntryPointDecorator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/EntryPointDecorator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
index 32ad24c8edcf..740272d62079 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/EntryPointDecorator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.asm;
+package jdk.compiler.graal.lir.asm;
 
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import jdk.compiler.graal.core.common.spi.CodeGenProviders;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/FrameContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/FrameContext.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/FrameContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/FrameContext.java
index c44317c7c741..0613a2b332a0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/asm/FrameContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/FrameContext.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.asm;
+package jdk.compiler.graal.lir.asm;
 
 /**
  * Code for managing a method's native frame.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
index 405916e3914f..83427a0aa147 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantLoadOptimization.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.constopt;
+package jdk.compiler.graal.lir.constopt;
 
-import static org.graalvm.compiler.lir.LIRValueUtil.asVariable;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVariable;
-import static org.graalvm.compiler.lir.phases.LIRPhase.Options.LIROptimization;
+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 java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -36,30 +36,28 @@
 import java.util.EnumSet;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.lir.CastValue;
-import org.graalvm.compiler.lir.InstructionValueConsumer;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInsertionBuffer;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.ValueConsumer;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.constopt.ConstantTree.Flags;
-import org.graalvm.compiler.lir.constopt.ConstantTree.NodeCost;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase;
-import org.graalvm.compiler.options.NestedBooleanOptionKey;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.AllocatableValue;
@@ -288,10 +286,10 @@ private static AllocatableValue getBasePointer(Value value) {
         @SuppressWarnings("try")
         private void createConstantTree(DefUseTree tree) {
             ConstantTree constTree = new ConstantTree(lir.getControlFlowGraph(), tree);
-            constTree.set(Flags.SUBTREE, tree.getBlock());
-            tree.forEach(u -> constTree.set(Flags.USAGE, u.getBlock()));
+            constTree.set(ConstantTree.Flags.SUBTREE, tree.getBlock());
+            tree.forEach(u -> constTree.set(ConstantTree.Flags.USAGE, u.getBlock()));
 
-            if (constTree.get(Flags.USAGE, tree.getBlock())) {
+            if (constTree.get(ConstantTree.Flags.USAGE, tree.getBlock())) {
                 // usage in the definition block -> no optimization
                 usageAtDefinitionSkipped.increment(debug);
                 return;
@@ -299,7 +297,7 @@ private void createConstantTree(DefUseTree tree) {
 
             constTree.markBlocks();
 
-            NodeCost cost = ConstantTreeAnalyzer.analyze(debug, constTree, tree.getBlock());
+            ConstantTree.NodeCost cost = ConstantTreeAnalyzer.analyze(debug, constTree, tree.getBlock());
             int usageCount = cost.getUsages().size();
             assert usageCount == tree.usageCount() : "Usage count differs: " + usageCount + " vs. " + tree.usageCount();
 
@@ -335,8 +333,8 @@ private void createLoads(DefUseTree tree, ConstantTree constTree, BasicBlock
             worklist.add(startBlock);
             while (!worklist.isEmpty()) {
                 BasicBlock block = worklist.pollLast();
-                if (constTree.get(Flags.CANDIDATE, block)) {
-                    constTree.set(Flags.MATERIALIZE, block);
+                if (constTree.get(ConstantTree.Flags.CANDIDATE, block)) {
+                    constTree.set(ConstantTree.Flags.MATERIALIZE, block);
                     // create and insert load
                     insertLoad(tree.getConstant(), tree.getVariable().getValueKind(), block, constTree.getCost(block).getUsages());
                 } else {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantTree.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantTree.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
index ea78a374c2a4..6fc23222241e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantTree.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.constopt;
+package jdk.compiler.graal.lir.constopt;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.cfg.DominatorOptimizationProblem;
-import org.graalvm.compiler.core.common.cfg.PropertyConsumable;
+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;
 
 /**
  * Represents a dominator (sub-)tree for a constant definition.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
index 3243f4e73397..53d4866eebd0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/ConstantTreeAnalyzer.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.constopt;
+package jdk.compiler.graal.lir.constopt;
 
 import java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -30,11 +30,9 @@
 import java.util.Deque;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.lir.constopt.ConstantTree.Flags;
-import org.graalvm.compiler.lir.constopt.ConstantTree.NodeCost;
+import jdk.compiler.graal.core.common.cfg.BasicBlock;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.debug.Indent;
 
 /**
  * Analyzes a {@link ConstantTree} and marks potential materialization positions.
@@ -44,7 +42,7 @@ public final class ConstantTreeAnalyzer {
     private final BitSet visited;
 
     @SuppressWarnings("try")
-    public static NodeCost analyze(DebugContext debug, ConstantTree tree, BasicBlock startBlock) {
+    public static ConstantTree.NodeCost analyze(DebugContext debug, ConstantTree tree, BasicBlock startBlock) {
         try (DebugContext.Scope s = debug.scope("ConstantTreeAnalyzer")) {
             ConstantTreeAnalyzer analyzer = new ConstantTreeAnalyzer(tree);
             analyzer.analyzeBlocks(debug, startBlock);
@@ -117,7 +115,7 @@ private void process(BasicBlock block) {
         BasicBlock child = block.getFirstDominated();
         while (child != null) {
             if (isMarked(child)) {
-                NodeCost childCost = tree.getCost(child);
+                ConstantTree.NodeCost childCost = tree.getCost(child);
                 assert childCost != null : "Child with null cost? block: " + child;
                 usages.addAll(childCost.getUsages());
                 numMat += childCost.getNumMaterializations();
@@ -136,12 +134,12 @@ private void process(BasicBlock block) {
             usages.addAll(usagesBlock);
             bestCost = probabilityBlock;
             numMat = 1;
-            tree.set(Flags.CANDIDATE, block);
+            tree.set(ConstantTree.Flags.CANDIDATE, block);
         } else {
             // stick with the current solution
         }
 
-        NodeCost nodeCost = new NodeCost(bestCost, usages, numMat);
+        ConstantTree.NodeCost nodeCost = new ConstantTree.NodeCost(bestCost, usages, numMat);
         tree.setCost(block, nodeCost);
     }
 
@@ -169,7 +167,7 @@ private void filteredPush(DebugContext debug, Deque> worklist, Bas
     }
 
     private void leafCost(BasicBlock block) {
-        tree.set(Flags.CANDIDATE, block);
+        tree.set(ConstantTree.Flags.CANDIDATE, block);
         tree.getOrInitCost(block);
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/DefUseTree.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/DefUseTree.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
index a6bcab81c7a1..0a9b9a39fd84 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/DefUseTree.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.constopt;
+package jdk.compiler.graal.lir.constopt;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRValueUtil;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.Variable;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/UseEntry.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/UseEntry.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/UseEntry.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/UseEntry.java
index 0b128eadf965..fee0309e2c7b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/UseEntry.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/UseEntry.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.constopt;
+package jdk.compiler.graal.lir.constopt;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.ValueProcedure;
+import jdk.compiler.graal.core.common.cfg.BasicBlock;
+import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.compiler.graal.lir.ValueProcedure;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/VariableMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/VariableMap.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/VariableMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/VariableMap.java
index a8eb8996a215..57ba1a5b7ca3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/constopt/VariableMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/VariableMap.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.constopt;
+package jdk.compiler.graal.lir.constopt;
 
 import java.util.ArrayList;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
-import org.graalvm.compiler.lir.Variable;
+import jdk.compiler.graal.lir.Variable;
 
 /**
  * Maps variables to a generic type.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/debug/IntervalDumper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/debug/IntervalDumper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
index 4cad11f1abf4..0544fd80401a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/debug/IntervalDumper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.debug;
+package jdk.compiler.graal.lir.debug;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
index a30b287b69e4..b77ebdaa9004 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/debug/LIRGenerationDebugContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.debug;
+package jdk.compiler.graal.lir.debug;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.LIR;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.lir.LIR;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/LocationMarker.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/LocationMarker.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
index 922886c9089b..de8d496d10ee 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/LocationMarker.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
@@ -22,29 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.dfa;
+package jdk.compiler.graal.lir.dfa;
 
 import static jdk.vm.ci.code.ValueUtil.isIllegal;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.lir.InstructionStateProcedure;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.LIRValueUtil;
-import org.graalvm.compiler.lir.ValueConsumer;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.util.ValueSet;
+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.vm.ci.code.Register;
 import jdk.vm.ci.meta.PlatformKind;
@@ -125,7 +123,7 @@ private void processBlock(BasicBlock block, UniqueWorkList worklist) {
         }
     }
 
-    private static final EnumSet REGISTER_FLAG_SET = EnumSet.of(OperandFlag.REG);
+    private static final EnumSet REGISTER_FLAG_SET = EnumSet.of(LIRInstruction.OperandFlag.REG);
 
     private S currentSet;
 
@@ -144,7 +142,7 @@ private void processInstructionBottomUp(LIRInstruction op) {
             if (frameMap != null && op.destroysCallerSavedRegisters()) {
                 for (Register reg : frameMap.getRegisterConfig().getCallerSaveRegisters()) {
                     PlatformKind kind = frameMap.getTarget().arch.getLargestStorableKind(reg.getRegisterCategory());
-                    defConsumer.visitValue(reg.asValue(LIRKind.value(kind)), OperandMode.TEMP, REGISTER_FLAG_SET);
+                    defConsumer.visitValue(reg.asValue(LIRKind.value(kind)), LIRInstruction.OperandMode.TEMP, REGISTER_FLAG_SET);
                 }
             }
 
@@ -169,7 +167,7 @@ public void doState(LIRInstruction inst, LIRFrameState info) {
 
     ValueConsumer useConsumer = new ValueConsumer() {
         @Override
-        public void visitValue(Value operand, OperandMode mode, EnumSet flags) {
+        public void visitValue(Value operand, LIRInstruction.OperandMode mode, EnumSet flags) {
             if (shouldProcessValue(operand)) {
                 // no need to insert values and derived reference
                 // Remove any cast so the uses and defs are in agreement about the type
@@ -188,7 +186,7 @@ public void visitValue(Value operand, OperandMode mode, EnumSet fla
 
     ValueConsumer defConsumer = new ValueConsumer() {
         @Override
-        public void visitValue(Value operand, OperandMode mode, EnumSet flags) {
+        public void visitValue(Value operand, LIRInstruction.OperandMode mode, EnumSet flags) {
             if (shouldProcessValue(operand)) {
                 DebugContext debug = lir.getDebug();
                 if (debug.isLogEnabled()) {
@@ -196,7 +194,8 @@ public void visitValue(Value operand, OperandMode mode, EnumSet fla
                 }
                 currentSet.remove(operand);
             } else {
-                assert isIllegal(operand) || !operand.getValueKind().equals(LIRKind.Illegal) || mode == OperandMode.TEMP : String.format("Illegal PlatformKind is only allowed for TEMP mode: %s, %s",
+                assert isIllegal(operand) || !operand.getValueKind().equals(LIRKind.Illegal) || mode == LIRInstruction.OperandMode.TEMP : String.format(
+                                "Illegal PlatformKind is only allowed for TEMP mode: %s, %s",
                                 operand, mode);
             }
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
index 8f2794ea856f..271e449e37ae 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/LocationMarkerPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.dfa;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase;
+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.vm.ci.code.ReferenceMap;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
index 8b16834dba7c..46e1a614c8ba 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/MarkBasePointersPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
@@ -22,25 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.dfa;
-
-import static org.graalvm.compiler.lir.LIRValueUtil.asVariable;
+package jdk.compiler.graal.lir.dfa;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.AllocationPhase;
-import org.graalvm.compiler.lir.util.IndexedValueMap;
-import org.graalvm.compiler.lir.util.ValueSet;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.Value;
@@ -58,7 +57,7 @@ protected void run(TargetDescription target, LIRGenerationResult lirGenRes, Allo
 
     private static final class Marker extends LocationMarker {
 
-        private final class BasePointersSet extends ValueSet {
+        private final class BasePointersSet extends ValueSet {
 
             private final Map> baseDerivedRefs;
 
@@ -94,7 +93,7 @@ private boolean verifyDerivedRefs(Value derivedRef, int base) {
 
             @Override
             public void put(Value v) {
-                Variable base = asVariable(v.getValueKind(LIRKind.class).getDerivedReferenceBase());
+                Variable base = LIRValueUtil.asVariable(v.getValueKind(LIRKind.class).getDerivedReferenceBase());
                 assert !base.getValueKind(LIRKind.class).isValue();
 
                 Set derivedRefs = baseDerivedRefs.get(base.index);
@@ -126,7 +125,7 @@ public void putAll(BasePointersSet v) {
 
             @Override
             public void remove(Value v) {
-                Variable base = asVariable(v.getValueKind(LIRKind.class).getDerivedReferenceBase());
+                Variable base = LIRValueUtil.asVariable(v.getValueKind(LIRKind.class).getDerivedReferenceBase());
                 assert !base.getValueKind(LIRKind.class).isValue();
                 Set derivedRefs = baseDerivedRefs.get(base.index);
                 // Just mark the base pointer as null if no derived references exist.
@@ -150,7 +149,7 @@ private IndexedValueMap getMap() {
                         continue;
                     }
                     Value v = entry.iterator().next();
-                    Variable base = asVariable(v.getValueKind(LIRKind.class).getDerivedReferenceBase());
+                    Variable base = LIRValueUtil.asVariable(v.getValueKind(LIRKind.class).getDerivedReferenceBase());
                     result.put(base.index, base);
                 }
                 return result;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
index 42e99a7a9c7a..957973e5ef12 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/RegStackValueSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.dfa;
+package jdk.compiler.graal.lir.dfa;
 
 import static jdk.vm.ci.code.ValueUtil.asRegister;
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
@@ -33,16 +33,15 @@
 import java.util.HashMap;
 import java.util.Objects;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.LIRValueUtil;
-import org.graalvm.compiler.lir.ValueConsumer;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
-import org.graalvm.compiler.lir.util.IndexedValueMap;
-import org.graalvm.compiler.lir.util.ValueSet;
+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.vm.ci.meta.Value;
 
@@ -167,7 +166,7 @@ private static boolean shouldProcessValue(Value v) {
     public void addLiveValues(ReferenceMapBuilder refMap) {
         ValueConsumer addLiveValue = new ValueConsumer() {
             @Override
-            public void visitValue(Value value, OperandMode mode, EnumSet flags) {
+            public void visitValue(Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
                 refMap.addLiveValue(value);
             }
         };
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
index f84ab82f71d6..e52d7f69ed07 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/dfa/UniqueWorkList.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.dfa;
+package jdk.compiler.graal.lir.dfa;
 
 import java.util.ArrayDeque;
 import java.util.BitSet;
 import java.util.Collection;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
+import jdk.compiler.graal.core.common.cfg.BasicBlock;
 
 /**
  * Ensures that an element is only in the worklist once.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMap.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMap.java
index dfc7ebdffb62..674e97f25c5e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMap.java
@@ -22,16 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.debug.GraalError;
+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.compiler.graal.lir.StandardOp;
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
@@ -303,8 +304,8 @@ public RegisterSaveLayout getRegisterSaveLayout(Register[] savedRegisters, Alloc
     }
 
     /**
-     * {@link org.graalvm.compiler.lir.StandardOp.SaveRegistersOp} might save more registers than
-     * {@link RegisterSaveLayout} should know about so permit subclasses to filter the contents.
+     * {@link StandardOp.SaveRegistersOp} might save more registers than {@link RegisterSaveLayout}
+     * should know about so permit subclasses to filter the contents.
      */
     protected Register[] filterSavedRegisters(Register[] savedRegisters) {
         return savedRegisters;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
index 6c91de92fdfe..15357b5ab372 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+import jdk.compiler.graal.lir.VirtualStackSlot;
+import jdk.compiler.graal.lir.gen.LIRGenerationResult;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
index 8d99a7867b06..cbb65c81892c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
@@ -22,25 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
-
-import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
+package jdk.compiler.graal.lir.framemap;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.InstructionValueConsumer;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+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.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
@@ -129,8 +126,8 @@ public FrameMap buildFrameMap(LIRGenerationResult res) {
 
     private static void verifyStackSlotAllocation(LIRGenerationResult res) {
         LIR lir = res.getLIR();
-        InstructionValueConsumer verifySlots = (LIRInstruction op, Value value, OperandMode mode, EnumSet flags) -> {
-            assert !isVirtualStackSlot(value) : String.format("Instruction %s contains a virtual stack slot %s", op, value);
+        InstructionValueConsumer verifySlots = (LIRInstruction op, Value value, LIRInstruction.OperandMode mode, EnumSet flags) -> {
+            assert !LIRValueUtil.isVirtualStackSlot(value) : String.format("Instruction %s contains a virtual stack slot %s", op, value);
         };
         for (BasicBlock block : lir.getControlFlowGraph().getBlocks()) {
             lir.getLIRforBlock(block).forEach(op -> {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
index 66ac2acb0a17..d5e49bae9d8b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/FrameMapBuilderTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
 import java.util.List;
 
-import org.graalvm.compiler.lir.VirtualStackSlot;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 
 /**
  * A {@link FrameMapBuilder} that allows access to the underlying {@link FrameMap}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
index 57d1e2f4acc5..4b5d40e37598 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/ReferenceMapBuilder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
-import org.graalvm.compiler.lir.LIRFrameState;
+import jdk.compiler.graal.lir.LIRFrameState;
 
 import jdk.vm.ci.code.ReferenceMap;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
index f384dc6154f2..956299dc045a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlot.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
-import org.graalvm.compiler.lir.VirtualStackSlot;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 
 import jdk.vm.ci.meta.ValueKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlotAlias.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlotAlias.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
index 6c2ae46f6301..2721c162462e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/SimpleVirtualStackSlotAlias.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
-import org.graalvm.compiler.lir.VirtualStackSlot;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 
 import jdk.vm.ci.meta.ValueKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
index e26df3eb1afa..c9a80d6fe66d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/framemap/VirtualStackSlotRange.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.framemap;
+package jdk.compiler.graal.lir.framemap;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.VirtualStackSlot;
+import jdk.compiler.graal.core.common.LIRKind;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 
 /**
  * Represents a contiguous and aligned range of memory in the frame of the method being compiled.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
index e2350ff613c7..72424f0a1993 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGenerator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.Variable;
+import jdk.compiler.graal.core.common.LIRKind;
+import jdk.compiler.graal.lir.Variable;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.PlatformKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
index d9263a5956a8..5edc1db3fb44 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/ArithmeticLIRGeneratorTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.Variable;
+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;
 
 import jdk.vm.ci.meta.Value;
 import jdk.vm.ci.meta.ValueKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/BarrierSetLIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/BarrierSetLIRGenerator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
index 8c73c7a070c8..6da0c96ca2e8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/BarrierSetLIRGenerator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
 public abstract class BarrierSetLIRGenerator implements BarrierSetLIRGeneratorTool {
     protected LIRGenerator lirGen;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/BarrierSetLIRGeneratorTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/BarrierSetLIRGeneratorTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
index 06be20df6de6..7e6078eca331 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/BarrierSetLIRGeneratorTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.Variable;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
index 4a5947acdefd..f5d1aedda77b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/DiagnosticLIRGeneratorTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
-import org.graalvm.compiler.lir.LIRInstruction;
+import jdk.compiler.graal.lir.LIRInstruction;
 
 import jdk.vm.ci.code.Register;
 import jdk.vm.ci.code.RegisterConfig;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
index 34057ec82594..991da2d7f629 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGenerationResult.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
+import jdk.compiler.graal.lir.LIR;
+import jdk.compiler.graal.lir.LIRInstruction;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.CompilationIdentifier.Verbosity;
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
+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.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.RegisterConfig;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGenerator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGenerator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
index 7119e29ab951..cd1cc861af9b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGenerator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
 import static jdk.vm.ci.code.ValueUtil.asAllocatableValue;
 import static jdk.vm.ci.code.ValueUtil.asStackSlot;
@@ -31,47 +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 org.graalvm.compiler.core.common.GraalOptions.LoopHeaderAlignment;
-import static org.graalvm.compiler.lir.LIRValueUtil.asConstant;
-import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
-import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVariable;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
-import static org.graalvm.compiler.lir.LIRValueUtil.stripCast;
+import static jdk.compiler.graal.core.common.GraalOptions.LoopHeaderAlignment;
 
 import java.util.ArrayList;
 import java.util.EnumSet;
 import java.util.List;
 import java.util.Optional;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
-import org.graalvm.compiler.lir.StandardOp.LabelOp;
-import org.graalvm.compiler.lir.SwitchStrategy;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.hashing.IntHasher;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.CallingConvention;
 import jdk.vm.ci.code.CodeCacheProvider;
@@ -239,7 +232,7 @@ public RegisterAttributes attributes(Register register) {
 
     @Override
     public Variable emitMove(Value input) {
-        assert !isVariable(input) : "Creating a copy of a variable via this method is not supported (and potentially a bug): " + input;
+        assert !LIRValueUtil.isVariable(input) : "Creating a copy of a variable via this method is not supported (and potentially a bug): " + input;
         return emitMoveHelper(input.getValueKind(), input);
     }
 
@@ -309,8 +302,8 @@ public AllocatableValue emitLoadConstant(ValueKind kind, Constant constant) {
     public AllocatableValue asAllocatable(Value value) {
         if (isAllocatableValue(value)) {
             return asAllocatableValue(value);
-        } else if (isConstantValue(value)) {
-            return emitLoadConstant(value.getValueKind(), asConstant(value));
+        } else if (LIRValueUtil.isConstantValue(value)) {
+            return emitLoadConstant(value.getValueKind(), LIRValueUtil.asConstant(value));
         } else {
             return emitMove(value);
         }
@@ -356,11 +349,11 @@ private static boolean verify(final LIRInstruction op) {
 
     // @formatter:off
     private static void allowed(Object op, Value val, LIRInstruction.OperandMode mode, EnumSet flags) {
-        Value value = stripCast(val);
-        if ((isVariable(value) && flags.contains(LIRInstruction.OperandFlag.REG)) ||
+        Value value = LIRValueUtil.stripCast(val);
+        if ((LIRValueUtil.isVariable(value) && flags.contains(LIRInstruction.OperandFlag.REG)) ||
             (isRegister(value) && flags.contains(LIRInstruction.OperandFlag.REG)) ||
-            (isStackSlotValue(value) && flags.contains(LIRInstruction.OperandFlag.STACK)) ||
-            (isConstantValue(value) && flags.contains(LIRInstruction.OperandFlag.CONST) && mode != LIRInstruction.OperandMode.DEF) ||
+            (LIRValueUtil.isStackSlotValue(value) && flags.contains(LIRInstruction.OperandFlag.STACK)) ||
+            (LIRValueUtil.isConstantValue(value) && flags.contains(LIRInstruction.OperandFlag.CONST) && mode != LIRInstruction.OperandMode.DEF) ||
             (isIllegal(value) && flags.contains(LIRInstruction.OperandFlag.ILLEGAL))) {
             return;
         }
@@ -388,7 +381,7 @@ public boolean hasBlockEnd(BasicBlock block) {
         if (ops.size() == 0) {
             return false;
         }
-        return ops.get(ops.size() - 1) instanceof BlockEndOp;
+        return ops.get(ops.size() - 1) instanceof StandardOp.BlockEndOp;
     }
 
     private final class BlockScopeImpl extends BlockScope {
@@ -406,7 +399,7 @@ private void doBlockStart() {
             assert res.getLIR().getLIRforBlock(currentBlock) == null : "LIR list already computed for this block";
             res.getLIR().setLIRforBlock(currentBlock, new ArrayList<>());
 
-            append(new LabelOp(new Label(currentBlock.getId()), currentBlock.isAligned() ? loopHeaderAlignment : 0));
+            append(new StandardOp.LabelOp(new Label(currentBlock.getId()), currentBlock.isAligned() ? loopHeaderAlignment : 0));
 
             if (traceLIRGeneratorLevel >= 1) {
                 TTY.println("BEGIN Generating LIR for block B" + currentBlock.getId());
@@ -461,7 +454,7 @@ public final DebugCloseable getMatchScope(BasicBlock block) {
     }
 
     public void emitIncomingValues(Value[] params) {
-        ((LabelOp) res.getLIR().getLIRforBlock(getCurrentBlock()).get(0)).setIncomingValues(params);
+        ((StandardOp.LabelOp) res.getLIR().getLIRforBlock(getCurrentBlock()).get(0)).setIncomingValues(params);
     }
 
     @Override
@@ -680,7 +673,7 @@ public LIRInstruction zapArgumentSpace() {
                 }
                 slots.add((StackSlot) arg);
             } else {
-                assert !isVirtualStackSlot(arg);
+                assert !LIRValueUtil.isVirtualStackSlot(arg);
             }
         }
         if (slots != null && isStackSlot(cc.getReturn())) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
index 914d12271617..f48536e6ae7c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/LIRGeneratorTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.asm.VectorSize;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRValueUtil;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.VirtualStackSlot;
+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.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/MoveFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/MoveFactory.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/MoveFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/MoveFactory.java
index 9140717d01cf..cbb9972e0cb3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/MoveFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/MoveFactory.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
+package jdk.compiler.graal.lir.gen;
 
+import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
+import jdk.compiler.graal.core.common.LIRKind;
+import jdk.compiler.graal.lir.framemap.FrameMapBuilder;
 
 import jdk.vm.ci.code.Architecture;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
index fb77572c706b..7149f9eabdb4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/gen/VerifyingMoveFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
@@ -22,17 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.gen;
-
-import static org.graalvm.compiler.lir.LIRValueUtil.isJavaConstant;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVariable;
+package jdk.compiler.graal.lir.gen;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
+import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.compiler.graal.lir.LIRValueUtil;
+import jdk.compiler.graal.lir.StandardOp;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Constant;
@@ -77,14 +73,14 @@ public LIRInstruction createStackMove(AllocatableValue result, AllocatableValue
     @Override
     public LIRInstruction createLoad(AllocatableValue result, Constant input) {
         LIRInstruction inst = inner.createLoad(result, input);
-        assert LoadConstantOp.isLoadConstantOp(inst) && checkResult(inst, result, null);
+        assert StandardOp.LoadConstantOp.isLoadConstantOp(inst) && checkResult(inst, result, null);
         return inst;
     }
 
     @Override
     public LIRInstruction createStackLoad(AllocatableValue result, Constant input) {
         LIRInstruction inst = inner.createStackLoad(result, input);
-        assert LoadConstantOp.isLoadConstantOp(inst) && checkResult(inst, result, null);
+        assert StandardOp.LoadConstantOp.isLoadConstantOp(inst) && checkResult(inst, result, null);
         return inst;
     }
 
@@ -106,27 +102,28 @@ private static class CheckClosure {
             this.input = input;
         }
 
-        void tempProc(LIRInstruction op, Value value, OperandMode mode, EnumSet flags) {
+        void tempProc(LIRInstruction op, Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
             assert false : String.format("SpillMoveFactory: Instruction %s is not allowed to contain operand %s of mode %s", op, value, mode);
             tempCount++;
         }
 
-        void stateProc(LIRInstruction op, Value value, OperandMode mode, EnumSet flags) {
+        void stateProc(LIRInstruction op, Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
             assert false : String.format("SpillMoveFactory: Instruction %s is not allowed to contain operand %s of mode %s", op, value, mode);
             stateCount++;
         }
 
-        void aliveProc(LIRInstruction op, Value value, OperandMode mode, EnumSet flags) {
-            assert !isVariable(value) && flags.contains(OperandFlag.UNINITIALIZED) : String.format("SpillMoveFactory: Instruction %s is not allowed to contain operand %s of mode %s", op, value, mode);
+        void aliveProc(LIRInstruction op, Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
+            assert !LIRValueUtil.isVariable(value) && flags.contains(LIRInstruction.OperandFlag.UNINITIALIZED) : String.format(
+                            "SpillMoveFactory: Instruction %s is not allowed to contain operand %s of mode %s", op, value, mode);
             aliveCount++;
         }
 
-        void inputProc(LIRInstruction op, Value value, OperandMode mode, EnumSet flags) {
-            assert value.equals(input) || isJavaConstant(value) : String.format("SpillMoveFactory: Instruction %s can only have %s as input, got %s", op, input, value);
+        void inputProc(LIRInstruction op, Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
+            assert value.equals(input) || LIRValueUtil.isJavaConstant(value) : String.format("SpillMoveFactory: Instruction %s can only have %s as input, got %s", op, input, value);
             inputCount++;
         }
 
-        void outputProc(LIRInstruction op, Value value, OperandMode mode, EnumSet flags) {
+        void outputProc(LIRInstruction op, Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
             assert value.equals(result) : String.format("SpillMoveFactory: Instruction %s can only have %s as input, got %s", op, input, value);
             outputCount++;
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/hashing/IntHasher.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/hashing/IntHasher.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/hashing/IntHasher.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/hashing/IntHasher.java
index 7afbd509b786..d86f95da6936 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/hashing/IntHasher.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/hashing/IntHasher.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.hashing;
+package jdk.compiler.graal.lir.hashing;
 
 import java.util.Arrays;
 import java.util.Optional;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/AllocationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/AllocationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
index d244ad87aebb..0252895e7663 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/AllocationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.lir.gen.MoveFactory;
+import jdk.compiler.graal.core.common.alloc.RegisterAllocationConfig;
+import jdk.compiler.graal.lir.gen.MoveFactory;
 
 public abstract class AllocationPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/AllocationStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationStage.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/AllocationStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationStage.java
index 7a573980e794..2fa311a57019 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/AllocationStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationStage.java
@@ -22,18 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.lir.alloc.AllocationStageVerifier;
-import org.graalvm.compiler.lir.alloc.lsra.LinearScanPhase;
-import org.graalvm.compiler.lir.dfa.MarkBasePointersPhase;
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
-import org.graalvm.compiler.lir.stackslotalloc.LSStackSlotAllocator;
-import org.graalvm.compiler.lir.stackslotalloc.SimpleStackSlotAllocator;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
-public class AllocationStage extends LIRPhaseSuite {
+public class AllocationStage extends LIRPhaseSuite {
 
     @SuppressWarnings("this-escape")
     public AllocationStage(OptionValues options) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
index f2f9ff6d0201..5765cee3d88c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyAllocationStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
@@ -22,15 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.alloc.lsra.LinearScanPhase;
-import org.graalvm.compiler.lir.dfa.MarkBasePointersPhase;
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
-import org.graalvm.compiler.lir.stackslotalloc.SimpleStackSlotAllocator;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
-public class EconomyAllocationStage extends LIRPhaseSuite {
+public class EconomyAllocationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
     public EconomyAllocationStage(@SuppressWarnings("unused") OptionValues options) {
         appendPhase(new MarkBasePointersPhase());
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyFinalCodeAnalysisStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyFinalCodeAnalysisStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
index c2029dc44591..80dbe7706b2a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyFinalCodeAnalysisStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.dfa.LocationMarkerPhase;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
+import jdk.compiler.graal.lir.dfa.LocationMarkerPhase;
+import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
 
 public class EconomyFinalCodeAnalysisStage extends LIRPhaseSuite {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
index 8387caf0f2bd..b0ea2b3f774b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyPostAllocationOptimizationStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
@@ -22,12 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.ComputeCodeEmissionOrder;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
+import jdk.compiler.graal.lir.ComputeCodeEmissionOrder;
 
-public class EconomyPostAllocationOptimizationStage extends LIRPhaseSuite {
+public class EconomyPostAllocationOptimizationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
     public EconomyPostAllocationOptimizationStage() {
         appendPhase(new ComputeCodeEmissionOrder());
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
index 9fde8ec8116d..f232905a9fee 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/EconomyPreAllocationOptimizationStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
@@ -22,12 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.alloc.SaveCalleeSaveRegisters;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
+import jdk.compiler.graal.lir.alloc.SaveCalleeSaveRegisters;
 
-public class EconomyPreAllocationOptimizationStage extends LIRPhaseSuite {
+public class EconomyPreAllocationOptimizationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
     public EconomyPreAllocationOptimizationStage() {
         /*
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/FinalCodeAnalysisPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/FinalCodeAnalysisPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
index 657478ca773d..875b351ba928 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/FinalCodeAnalysisPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
 
 public abstract class FinalCodeAnalysisPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/FinalCodeAnalysisStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/FinalCodeAnalysisStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
index a66e73928428..30d3d7e0e366 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/FinalCodeAnalysisStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.dfa.LocationMarkerPhase;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.lir.dfa.LocationMarkerPhase;
+import jdk.compiler.graal.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
+import jdk.compiler.graal.options.OptionValues;
 
 public class FinalCodeAnalysisStage extends LIRPhaseSuite {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhase.java
index 0f1f3cacc5ac..bf5af1c82954 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
 import java.util.regex.Pattern;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope;
-import org.graalvm.compiler.debug.MemUseTrackerKey;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+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.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
index b76c3691ee54..7f9c2ee499ce 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRPhaseSuite.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.ListIterator;
 
-import org.graalvm.compiler.core.common.util.PhasePlan;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRSuites.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRSuites.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRSuites.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRSuites.java
index ef3cc42c2bff..036171019bb8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/LIRSuites.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRSuites.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
+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.vm.ci.code.ReferenceMap;
 import jdk.vm.ci.code.StackSlot;
 
 public class LIRSuites {
 
-    private final LIRPhaseSuite preAllocOptStage;
+    private final LIRPhaseSuite preAllocOptStage;
     private final LIRPhaseSuite allocStage;
     private final LIRPhaseSuite postAllocStage;
     private final LIRPhaseSuite finalCodeAnalysisStage;
 
-    public LIRSuites(LIRPhaseSuite preAllocOptStage, LIRPhaseSuite allocStage, LIRPhaseSuite postAllocStage,
+    public LIRSuites(LIRPhaseSuite preAllocOptStage, LIRPhaseSuite allocStage,
+                    LIRPhaseSuite postAllocStage,
                     LIRPhaseSuite finalCodeAnalysisStage) {
         this.preAllocOptStage = preAllocOptStage;
         this.allocStage = allocStage;
@@ -64,7 +64,7 @@ public LIRSuites(LIRSuites other) {
      * {@link LIRGeneratorTool#newVariable variables}, {@link LIRGenerationResult#getFrameMap stack
      * slots} and {@link LIRGenerationResult#getFrameMapBuilder virtual stack slots}.
      */
-    public LIRPhaseSuite getPreAllocationOptimizationStage() {
+    public LIRPhaseSuite getPreAllocationOptimizationStage() {
         return preAllocOptStage;
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
index 3222c6938462..1757cbdddb42 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder;
-import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool;
+import jdk.compiler.graal.core.common.cfg.CodeEmissionOrder;
+import jdk.compiler.graal.lir.gen.DiagnosticLIRGeneratorTool;
 
 public abstract class PostAllocationOptimizationPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
index 7507110b9e03..26158011b1a0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PostAllocationOptimizationStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
@@ -22,35 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import static org.graalvm.compiler.lir.phases.LIRPhase.Options.LIROptimization;
-
-import org.graalvm.compiler.lir.ComputeCodeEmissionOrder;
-import org.graalvm.compiler.lir.ControlFlowOptimizer;
-import org.graalvm.compiler.lir.EdgeMoveOptimizer;
-import org.graalvm.compiler.lir.NullCheckOptimizer;
-import org.graalvm.compiler.lir.RedundantMoveElimination;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import org.graalvm.compiler.lir.profiling.MethodProfilingPhase;
-import org.graalvm.compiler.lir.profiling.MoveProfilingPhase;
-import org.graalvm.compiler.options.NestedBooleanOptionKey;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 public class PostAllocationOptimizationStage extends LIRPhaseSuite {
     public static class Options {
         // @formatter:off
         @Option(help = "", type = OptionType.Debug)
-        public static final NestedBooleanOptionKey LIROptEdgeMoveOptimizer = new NestedBooleanOptionKey(LIROptimization, true);
+        public static final NestedBooleanOptionKey LIROptEdgeMoveOptimizer = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true);
         @Option(help = "", type = OptionType.Debug)
-        public static final NestedBooleanOptionKey LIROptControlFlowOptimizer = new NestedBooleanOptionKey(LIROptimization, true);
+        public static final NestedBooleanOptionKey LIROptControlFlowOptimizer = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true);
         @Option(help = "", type = OptionType.Debug)
-        public static final NestedBooleanOptionKey LIROptRedundantMoveElimination = new NestedBooleanOptionKey(LIROptimization, true);
+        public static final NestedBooleanOptionKey LIROptRedundantMoveElimination = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true);
         @Option(help = "", type = OptionType.Debug)
-        public static final NestedBooleanOptionKey LIROptNullCheckOptimizer = new NestedBooleanOptionKey(LIROptimization, true);
+        public static final NestedBooleanOptionKey LIROptNullCheckOptimizer = new NestedBooleanOptionKey(LIRPhase.Options.LIROptimization, true);
         @Option(help = "Enables profiling of move types on LIR level. " +
                        "Move types are for example stores (register to stack), " +
                        "constant loads (constant to register) or copies (register to register).", type = OptionType.Debug)
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
index 770aa2be8f01..28cb56115568 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+import jdk.compiler.graal.lir.gen.LIRGeneratorTool;
 
 public abstract class PreAllocationOptimizationPhase extends LIRPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
index de31dba0d709..c0f2329f8fe1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/phases/PreAllocationOptimizationStage.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
@@ -22,14 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.phases;
+package jdk.compiler.graal.lir.phases;
 
-import org.graalvm.compiler.lir.alloc.SaveCalleeSaveRegisters;
-import org.graalvm.compiler.lir.constopt.ConstantLoadOptimization;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.lir.alloc.SaveCalleeSaveRegisters;
+import jdk.compiler.graal.lir.constopt.ConstantLoadOptimization;
+import jdk.compiler.graal.options.OptionValues;
 
-public class PreAllocationOptimizationStage extends LIRPhaseSuite {
+public class PreAllocationOptimizationStage extends LIRPhaseSuite {
     @SuppressWarnings("this-escape")
     public PreAllocationOptimizationStage(OptionValues options) {
         if (ConstantLoadOptimization.Options.LIROptConstantLoadOptimization.getValue(options)) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
index 160a5b38b2c7..feb2e7587f52 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MethodProfilingPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.profiling;
+package jdk.compiler.graal.lir.profiling;
 
 import java.util.ArrayList;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInsertionBuffer;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
-import org.graalvm.compiler.lir.StandardOp.LabelOp;
-import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
index 11cc236e4713..0c2a1aaac2e0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveProfiler.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.profiling;
+package jdk.compiler.graal.lir.profiling;
 
 import java.util.ArrayList;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
-import org.graalvm.compiler.lir.StandardOp.LabelOp;
-import org.graalvm.compiler.lir.StandardOp.MoveOp;
+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;
 
 public final class MoveProfiler {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
index 0a0c06531b02..b945d432ea55 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveProfilingPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.profiling;
+package jdk.compiler.graal.lir.profiling;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInsertionBuffer;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.gen.DiagnosticLIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase;
-import org.graalvm.compiler.lir.profiling.MoveProfiler.MoveStatistics;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveType.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveType.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveType.java
index 19f3cd725aa9..2e98d1fd5c2a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/profiling/MoveType.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveType.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.profiling;
+package jdk.compiler.graal.lir.profiling;
 
 import static jdk.vm.ci.code.ValueUtil.isRegister;
 import static jdk.vm.ci.code.ValueUtil.isStackSlot;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.StandardOp.MoveOp;
-import org.graalvm.compiler.lir.StandardOp.ValueMoveOp;
+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.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ssa/SSAUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ssa/SSAUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
index 3f95dbb8fcc8..8641b5956358 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ssa/SSAUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
@@ -22,18 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.ssa;
+package jdk.compiler.graal.lir.ssa;
 
 import java.util.ArrayList;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
-import org.graalvm.compiler.lir.StandardOp.JumpOp;
-import org.graalvm.compiler.lir.StandardOp.LabelOp;
+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.vm.ci.meta.Value;
 
@@ -46,10 +44,11 @@
  * as parallel copy that span across a control-flow edge.
  *
  * The variables introduced by PHIs of a specific {@linkplain BasicBlock merge block}
- * are {@linkplain LabelOp#setIncomingValues attached} to the {@linkplain LabelOp} of the block. The
- * outgoing values from the predecessor are {@link JumpOp#getOutgoingValue input} to the
- * {@linkplain BlockEndOp} of the predecessor. Because there are no critical edges we know that the
- * {@link BlockEndOp} of the predecessor has to be a {@link JumpOp}.
+ * are {@linkplain StandardOp.LabelOp#setIncomingValues attached} to the
+ * {@linkplain StandardOp.LabelOp} of the block. The outgoing values from the predecessor are
+ * {@link StandardOp.JumpOp#getOutgoingValue input} to the {@linkplain StandardOp.BlockEndOp} of the
+ * predecessor. Because there are no critical edges we know that the {@link StandardOp.BlockEndOp}
+ * of the predecessor has to be a {@link StandardOp.JumpOp}.
  *
  * 
Example:

  *
@@ -100,8 +99,8 @@ public static void forEachPhiValuePair(LIR lir, BasicBlock merge, BasicBlock<
         assert pred.getSuccessorCount() == 1 : String.format("Merge predecessor block %s has more than one successor", pred);
         assert pred.getSuccessorAt(0) == merge : String.format("Predecessor block %s has wrong successor: %s, should be: %s", pred, pred.getSuccessorAt(0), merge);
 
-        JumpOp jump = phiOut(lir, pred);
-        LabelOp label = phiIn(lir, merge);
+        StandardOp.JumpOp jump = phiOut(lir, pred);
+        StandardOp.LabelOp label = phiIn(lir, merge);
 
         assert label.getPhiSize() == jump.getPhiSize() : String.format("Phi In/Out size mismatch: in=%d vs. out=%d", label.getPhiSize(), jump.getPhiSize());
 
@@ -110,35 +109,35 @@ public static void forEachPhiValuePair(LIR lir, BasicBlock merge, BasicBlock<
         }
     }
 
-    public static JumpOp phiOut(LIR lir, BasicBlock block) {
+    public static StandardOp.JumpOp phiOut(LIR lir, BasicBlock block) {
         assert block.getSuccessorCount() == 1;
         ArrayList instructions = lir.getLIRforBlock(block);
         int index = instructions.size() - 1;
         LIRInstruction op = instructions.get(index);
-        return (JumpOp) op;
+        return (StandardOp.JumpOp) op;
     }
 
     public static int phiOutIndex(LIR lir, BasicBlock block) {
         assert block.getSuccessorCount() == 1;
         ArrayList instructions = lir.getLIRforBlock(block);
         int index = instructions.size() - 1;
-        assert instructions.get(index) instanceof JumpOp;
+        assert instructions.get(index) instanceof StandardOp.JumpOp;
         return index;
     }
 
-    public static LabelOp phiIn(LIR lir, BasicBlock block) {
+    public static StandardOp.LabelOp phiIn(LIR lir, BasicBlock block) {
         assert block.getPredecessorCount() > 1;
-        LabelOp label = (LabelOp) lir.getLIRforBlock(block).get(0);
+        StandardOp.LabelOp label = (StandardOp.LabelOp) lir.getLIRforBlock(block).get(0);
         return label;
     }
 
     public static void removePhiOut(LIR lir, BasicBlock block) {
-        JumpOp jump = phiOut(lir, block);
+        StandardOp.JumpOp jump = phiOut(lir, block);
         jump.clearOutgoingValues();
     }
 
     public static void removePhiIn(LIR lir, BasicBlock block) {
-        LabelOp label = phiIn(lir, block);
+        StandardOp.LabelOp label = phiIn(lir, block);
         label.clearIncomingValues();
     }
 
@@ -157,7 +156,7 @@ public static void verifyPhi(LIR lir, BasicBlock merge) {
         }
     }
 
-    public static int indexOfValue(LabelOp label, Value value) {
+    public static int indexOfValue(StandardOp.LabelOp label, Value value) {
         for (int i = 0; i < label.getIncomingSize(); i++) {
             if (label.getIncomingValue(i).equals(value)) {
                 return i;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
index 9a0fc1651843..97bfcee1fa49 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/ssa/SSAVerifier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
@@ -23,26 +23,21 @@
  * questions.
  */
 
-package org.graalvm.compiler.lir.ssa;
+package jdk.compiler.graal.lir.ssa;
 
 import static jdk.vm.ci.code.ValueUtil.isRegister;
-import static org.graalvm.compiler.lir.LIRValueUtil.isCast;
-import static org.graalvm.compiler.lir.LIRValueUtil.isConstantValue;
-import static org.graalvm.compiler.lir.LIRValueUtil.isStackSlotValue;
-import static org.graalvm.compiler.lir.LIRValueUtil.stripCast;
 
 import java.util.EnumSet;
 import java.util.HashMap;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BasicBlockSet;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.lir.InstructionValueConsumer;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
+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.vm.ci.meta.Value;
 
@@ -119,10 +114,10 @@ private boolean verifyBlock(BasicBlock block) {
      * @param mode
      * @param flags
      */
-    private void useConsumer(LIRInstruction inst, Value val, OperandMode mode, EnumSet flags) {
-        Value value = stripCast(val);
+    private void useConsumer(LIRInstruction inst, Value val, LIRInstruction.OperandMode mode, EnumSet flags) {
+        Value value = LIRValueUtil.stripCast(val);
         if (shouldProcess(value)) {
-            assert defined.containsKey(value) || flags.contains(OperandFlag.UNINITIALIZED) : String.format("Value %s used at instruction %s in block %s but never defined", value, inst,
+            assert defined.containsKey(value) || flags.contains(LIRInstruction.OperandFlag.UNINITIALIZED) : String.format("Value %s used at instruction %s in block %s but never defined", value, inst,
                             currentBlock);
         }
     }
@@ -132,8 +127,8 @@ private void useConsumer(LIRInstruction inst, Value val, OperandMode mode, EnumS
      * @param mode
      * @param flags
      */
-    private void defConsumer(LIRInstruction inst, Value value, OperandMode mode, EnumSet flags) {
-        assert !isCast(value);
+    private void defConsumer(LIRInstruction inst, Value value, LIRInstruction.OperandMode mode, EnumSet flags) {
+        assert !LIRValueUtil.isCast(value);
         if (shouldProcess(value)) {
             assert !defined.containsKey(value) : String.format("Value %s redefined at %s (previous definition %s in block %s)", value, inst, defined.get(value).inst,
                             defined.get(value).block);
@@ -142,7 +137,7 @@ private void defConsumer(LIRInstruction inst, Value value, OperandMode mode, Enu
     }
 
     private static boolean shouldProcess(Value value) {
-        return !value.equals(Value.ILLEGAL) && !isConstantValue(value) && !isRegister(value) && !isStackSlotValue(value);
+        return !value.equals(Value.ILLEGAL) && !LIRValueUtil.isConstantValue(value) && !isRegister(value) && !LIRValueUtil.isStackSlotValue(value);
     }
 
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
index e04975598de6..f84884c87b1e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/FixPointIntervalBuilder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.stackslotalloc;
+package jdk.compiler.graal.lir.stackslotalloc;
 
-import static org.graalvm.compiler.lir.LIRValueUtil.asVirtualStackSlot;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
+import static jdk.compiler.graal.lir.LIRValueUtil.asVirtualStackSlot;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.lir.InstructionValueConsumer;
-import org.graalvm.compiler.lir.InstructionValueProcedure;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlotAlias;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
index 363e3defddca..cc8b1dce5ddc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/LSStackSlotAllocator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.stackslotalloc;
+package jdk.compiler.graal.lir.stackslotalloc;
 
-import static org.graalvm.compiler.debug.DebugContext.BASIC_LEVEL;
-import static org.graalvm.compiler.lir.LIRValueUtil.asVirtualStackSlot;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
-import static org.graalvm.compiler.lir.phases.LIRPhase.Options.LIROptimization;
+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 java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -38,29 +38,29 @@
 import java.util.function.Predicate;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
-import org.graalvm.compiler.lir.ValueProcedure;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilderTool;
-import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlot;
-import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlotAlias;
-import org.graalvm.compiler.lir.framemap.VirtualStackSlotRange;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.AllocationPhase;
-import org.graalvm.compiler.options.NestedBooleanOptionKey;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.code.StackSlot;
@@ -74,8 +74,8 @@
  * Remark: The analysis works under the assumption that a stack slot is no longer live after
  * its last usage. If an {@link LIRInstruction instruction} transfers the raw address of the stack
  * slot to another location, e.g. a registers, and this location is referenced later on, the
- * {@link org.graalvm.compiler.lir.LIRInstruction.Use usage} of the stack slot must be marked with
- * the {@link OperandFlag#UNINITIALIZED}. Otherwise the stack slot might be reused and its content
+ * {@link LIRInstruction.Use usage} of the stack slot must be marked with the
+ * {@link OperandFlag#UNINITIALIZED}. Otherwise the stack slot might be reused and its content
  * destroyed.
  */
 public final class LSStackSlotAllocator extends AllocationPhase {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
index 5d0565da2aa5..5bc63c748aed 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/SimpleStackSlotAllocator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
@@ -22,27 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.stackslotalloc;
+package jdk.compiler.graal.lir.stackslotalloc;
 
-import static org.graalvm.compiler.lir.LIRValueUtil.asVirtualStackSlot;
-import static org.graalvm.compiler.lir.LIRValueUtil.isVirtualStackSlot;
-import static org.graalvm.compiler.lir.stackslotalloc.StackSlotAllocatorUtil.allocatedFramesize;
-import static org.graalvm.compiler.lir.stackslotalloc.StackSlotAllocatorUtil.allocatedSlots;
-import static org.graalvm.compiler.lir.stackslotalloc.StackSlotAllocatorUtil.virtualFramesize;
+import static jdk.compiler.graal.lir.LIRValueUtil.asVirtualStackSlot;
+import static jdk.compiler.graal.lir.LIRValueUtil.isVirtualStackSlot;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.ValueProcedure;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilderTool;
-import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlot;
-import org.graalvm.compiler.lir.framemap.SimpleVirtualStackSlotAlias;
-import org.graalvm.compiler.lir.framemap.VirtualStackSlotRange;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.AllocationPhase;
+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.vm.ci.code.StackSlot;
 import jdk.vm.ci.code.TargetDescription;
@@ -59,31 +56,31 @@ protected void run(TargetDescription target, LIRGenerationResult lirGenRes, Allo
     public void allocateStackSlots(FrameMapBuilderTool builder, LIRGenerationResult res) {
         DebugContext debug = res.getLIR().getDebug();
         StackSlot[] mapping = new StackSlot[builder.getNumberOfStackSlots()];
-        boolean allocatedFramesizeEnabled = allocatedFramesize.isEnabled(debug);
+        boolean allocatedFramesizeEnabled = StackSlotAllocatorUtil.allocatedFramesize.isEnabled(debug);
         long currentFrameSize = allocatedFramesizeEnabled ? builder.getFrameMap().currentFrameSize() : 0;
         for (VirtualStackSlot virtualSlot : builder.getStackSlots()) {
             final StackSlot slot;
             if (virtualSlot instanceof SimpleVirtualStackSlot) {
                 ValueKind slotKind = virtualSlot.getValueKind();
                 slot = builder.getFrameMap().allocateSpillSlot(slotKind);
-                virtualFramesize.add(debug, builder.getFrameMap().spillSlotSize(slotKind));
+                StackSlotAllocatorUtil.virtualFramesize.add(debug, builder.getFrameMap().spillSlotSize(slotKind));
             } else if (virtualSlot instanceof SimpleVirtualStackSlotAlias) {
                 ValueKind slotKind = ((SimpleVirtualStackSlotAlias) virtualSlot).getAliasedSlot().getValueKind();
                 slot = builder.getFrameMap().allocateSpillSlot(slotKind);
-                virtualFramesize.add(debug, builder.getFrameMap().spillSlotSize(slotKind));
+                StackSlotAllocatorUtil.virtualFramesize.add(debug, builder.getFrameMap().spillSlotSize(slotKind));
             } else if (virtualSlot instanceof VirtualStackSlotRange) {
                 VirtualStackSlotRange slotRange = (VirtualStackSlotRange) virtualSlot;
                 slot = builder.getFrameMap().allocateStackMemory(slotRange.getSizeInBytes(), slotRange.getAlignmentInBytes());
-                virtualFramesize.add(debug, slotRange.getSizeInBytes());
+                StackSlotAllocatorUtil.virtualFramesize.add(debug, slotRange.getSizeInBytes());
             } else {
                 throw GraalError.shouldNotReachHere("Unknown VirtualStackSlot: " + virtualSlot); // ExcludeFromJacocoGeneratedReport
             }
-            allocatedSlots.increment(debug);
+            StackSlotAllocatorUtil.allocatedSlots.increment(debug);
             mapping[virtualSlot.getId()] = slot;
         }
         updateLIR(res, mapping);
         if (allocatedFramesizeEnabled) {
-            allocatedFramesize.add(debug, builder.getFrameMap().currentFrameSize() - currentFrameSize);
+            StackSlotAllocatorUtil.allocatedFramesize.add(debug, builder.getFrameMap().currentFrameSize() - currentFrameSize);
         }
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
index 1ebb1fac8a76..d6965a663460 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackInterval.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.stackslotalloc;
+package jdk.compiler.graal.lir.stackslotalloc;
 
-import org.graalvm.compiler.lir.VirtualStackSlot;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 
 import jdk.vm.ci.code.StackSlot;
 import jdk.vm.ci.meta.ValueKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
index 6a7564ba87c8..501dc81c981b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackIntervalDumper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.stackslotalloc;
+package jdk.compiler.graal.lir.stackslotalloc;
 
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.debug.IntervalDumper;
+import jdk.compiler.graal.lir.debug.IntervalDumper;
+import jdk.compiler.graal.lir.VirtualStackSlot;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
index d504be477699..8645aded739d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/stackslotalloc/StackSlotAllocatorUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.stackslotalloc;
+package jdk.compiler.graal.lir.stackslotalloc;
 
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
+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.vm.ci.code.StackSlot;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/GenericValueMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/GenericValueMap.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/GenericValueMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/GenericValueMap.java
index e21aca11a004..baf5b6ea6a90 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/GenericValueMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/GenericValueMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.util;
+package jdk.compiler.graal.lir.util;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/IndexedValueMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/IndexedValueMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
index 019d8a3a9eca..40d5d942c2f8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/IndexedValueMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
@@ -22,19 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.util;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.InstructionValueConsumer;
-import org.graalvm.compiler.lir.InstructionValueProcedure;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstruction.OperandFlag;
-import org.graalvm.compiler.lir.LIRInstruction.OperandMode;
+import jdk.compiler.graal.debug.GraalError;
 
 import jdk.vm.ci.meta.Value;
 
@@ -439,7 +437,7 @@ private boolean isSubsetOf(IndexedValueMap other) {
      * @param flags a set of flags for each value
      * @param proc procedure to apply to each value
      */
-    public void forEach(LIRInstruction inst, OperandMode mode, EnumSet flags, InstructionValueProcedure proc) {
+    public void forEach(LIRInstruction inst, LIRInstruction.OperandMode mode, EnumSet flags, InstructionValueProcedure proc) {
         if (values != null) {
             for (int i = 0; i < values.length; i++) {
                 if (values[i] != null) {
@@ -467,7 +465,7 @@ public void forEach(LIRInstruction inst, OperandMode mode, EnumSet
      * @param flags a set of flags for each value
      * @param consumer consumer function to be called for each value
      */
-    public void visitEach(LIRInstruction inst, OperandMode mode, EnumSet flags, InstructionValueConsumer consumer) {
+    public void visitEach(LIRInstruction inst, LIRInstruction.OperandMode mode, EnumSet flags, InstructionValueConsumer consumer) {
         if (values != null) {
             for (Value v : values) {
                 if (v != null) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/RegisterMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/RegisterMap.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/RegisterMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/RegisterMap.java
index 5e17d250d342..c5230102dfe3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/RegisterMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/RegisterMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.util;
+package jdk.compiler.graal.lir.util;
 
 import java.util.function.BiConsumer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/ValueMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueMap.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/ValueMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueMap.java
index 6eca65290074..5bcb1e7d1d97 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/ValueMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.util;
+package jdk.compiler.graal.lir.util;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/ValueSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueSet.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/ValueSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueSet.java
index 9bb3331f9667..7724893e931c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/lir/util/ValueSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.lir.util;
+package jdk.compiler.graal.lir.util;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
index 0387324a2bbb..26ee77ab63ba 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/ConvertDeoptimizeToGuardPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
@@ -22,57 +22,57 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
+import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StaticDeoptimizingNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
-import org.graalvm.compiler.phases.common.LazyValue;
-import org.graalvm.compiler.phases.common.PostRunCanonicalizationPhase;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
index b4aa4fb53672..0ff4f5bcd8c7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopFullUnrollPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopPolicies;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
+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;
 
 public class LoopFullUnrollPhase extends LoopPhase {
     public static class Options {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
index a11db868b63e..8f835427bedb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPartialUnrollPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.OpaqueNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopPolicies;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
+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;
 
 public class LoopPartialUnrollPhase extends LoopPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
index f30baa549b67..3f2edef583d9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPeelingPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopPolicies;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+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;
 
 public class LoopPeelingPhase extends LoopPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPhase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPhase.java
index 20c89d002d7a..8e9ff268ab0e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPhase.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
-import org.graalvm.compiler.nodes.loop.LoopPolicies;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.PostRunCanonicalizationPhase;
+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;
 
 public abstract class LoopPhase
 extends PostRunCanonicalizationPhase {
     private final P policies;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPredicationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPredicationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
index 87ed466f07a9..add4efb4efd6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopPredicationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
@@ -24,50 +24,50 @@
  * questions.
  */
 
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.LoopPredicationMainPath;
-import static org.graalvm.compiler.core.common.calc.Condition.EQ;
-import static org.graalvm.compiler.core.common.calc.Condition.NE;
+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 java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.GuardedValueNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.MultiGuardNode;
-import org.graalvm.compiler.nodes.loop.CountedLoopInfo;
-import org.graalvm.compiler.nodes.loop.InductionVariable;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.loop.MathUtil;
-import org.graalvm.compiler.phases.Speculative;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.PostRunCanonicalizationPhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
+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.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.SpeculationLog;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
index c271ddb507ab..348c3a2cd14c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopSafepointEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.loop.InductionVariable;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopTransformations.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
index eff95e1b6467..470afbde073a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopTransformations.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumDesiredSize;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph.Mark;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardPhiNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.extended.OpaqueNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.loop.CountedLoopInfo;
-import org.graalvm.compiler.nodes.loop.DefaultLoopPolicies;
-import org.graalvm.compiler.nodes.loop.InductionVariable.Direction;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopFragment;
-import org.graalvm.compiler.nodes.loop.LoopFragmentInside;
-import org.graalvm.compiler.nodes.loop.LoopFragmentWhole;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.util.IntegerHelper;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
+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;
 
 public abstract class LoopTransformations {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
index bf2aed829acb..cae3807c6e49 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/LoopUnswitchingPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
 import java.util.Iterator;
 import java.util.List;
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopPolicies;
-import org.graalvm.compiler.nodes.loop.LoopPolicies.UnswitchingDecision;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+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;
 
 public class LoopUnswitchingPhase extends LoopPhase {
     private static final CounterKey UNSWITCH_CANDIDATES = DebugContext.counter("UnswitchCandidates");
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
index 4f132192c4d8..e949f721fff7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/loop/phases/SpeculativeGuardMovementPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
@@ -22,64 +22,64 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.loop.phases;
+package jdk.compiler.graal.loop.phases;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.GuardedValueNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.ShortCircuitOrNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.MultiGuardNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.loop.CountedLoopInfo;
-import org.graalvm.compiler.nodes.loop.InductionVariable;
-import org.graalvm.compiler.nodes.loop.InductionVariable.Direction;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.phases.FloatingGuardPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.PostRunCanonicalizationPhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
+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.vm.ci.meta.DefaultProfilingInfo;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/InputType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/InputType.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/InputType.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/InputType.java
index c684e4cc99e4..c982c9ab2285 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/InputType.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/InputType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodeinfo;
+package jdk.compiler.graal.nodeinfo;
 
 /**
  * Constants denoting how a node is using an input node.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeCycles.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeCycles.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
index b606febf245c..26a0060a11d6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeCycles.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodeinfo;
+package jdk.compiler.graal.nodeinfo;
 
 /**
  * Constants representing an estimation of the number of CPU cycles needed to execute a certain
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
index f306b5f955ed..e343af8a460f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
@@ -22,16 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodeinfo;
+package jdk.compiler.graal.nodeinfo;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNSET;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNSET;
-
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
 public @interface NodeInfo {
@@ -54,7 +51,7 @@
      * {@link NodeCycles} value is {@link NodeCycles#CYCLES_UNSET}. As such, it is recommended to
      * specify a value for nodes likely to be inputs to a graph cost model.
      */
-    NodeCycles cycles() default CYCLES_UNSET;
+    NodeCycles cycles() default NodeCycles.CYCLES_UNSET;
 
     /**
      * A rationale for the chosen {@link NodeInfo#cycles()} value.
@@ -69,7 +66,7 @@
      * {@link NodeSize} value is {@link NodeSize#SIZE_UNSET}. As such, it is recommended to specify
      * a value for nodes likely to be inputs to a graph cost model.
      */
-    NodeSize size() default SIZE_UNSET;
+    NodeSize size() default NodeSize.SIZE_UNSET;
 
     /**
      * A rationale for the chosen {@link NodeInfo#size()} value.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeSize.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeSize.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeSize.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeSize.java
index da8c2bfcffe1..587e5a5d1729 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/NodeSize.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeSize.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodeinfo;
+package jdk.compiler.graal.nodeinfo;
 
 /**
  * Constants representing the abstract number of CPU instructions needed to represent a node. This
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/StructuralInput.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/StructuralInput.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
index ce252aaa3f8e..06ebc90add66 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/StructuralInput.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodeinfo;
+package jdk.compiler.graal.nodeinfo;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Inherited;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/Verbosity.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/Verbosity.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/Verbosity.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/Verbosity.java
index 284567e6a549..d2abf8a52c17 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodeinfo/Verbosity.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/Verbosity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodeinfo;
+package jdk.compiler.graal.nodeinfo;
 
 public enum Verbosity {
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractBeginNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractBeginNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
index d07c2a4174fd..516d7cd422da 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractBeginNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(allowedUsageTypes = {InputType.Guard, InputType.Anchor})
 public abstract class AbstractBeginNode extends FixedWithNextNode implements LIRLowerable, GuardingNode, AnchoringNode, IterableNodeType {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
index c853e6033adf..2cfa4bf880ed 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractDeoptimizeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractEndNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractEndNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractEndNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractEndNode.java
index 82f3bb06caab..cba24558ef03 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractEndNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractEndNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.Collections;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public abstract class AbstractEndNode extends FixedNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
index ded6181c2ad7..cdd0f6270871 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractFixedGuardNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractLocalNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractLocalNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
index edd7fb55f674..f1c3d8387d27 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractLocalNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_1)
 public abstract class AbstractLocalNode extends FloatingNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractMergeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractMergeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
index c2614012d4b3..6fc51a875049 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractMergeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 java.util.List;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * Denotes the merging of multiple control-flow paths.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractStateSplit.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractStateSplit.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
index 7103bec72936..28ebda464def 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/AbstractStateSplit.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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;
 
 /**
  * Provides an implementation of {@link StateSplit}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ArithmeticOperation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ArithmeticOperation.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
index 619d0fcb50e3..6c6c256ed941 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ArithmeticOperation.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.Op;
-import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
+import jdk.compiler.graal.core.common.type.ArithmeticOpTable.Op;
+import jdk.compiler.graal.graph.Node.IndirectCanonicalization;
 
 /**
  * An {@code ArithmeticOperation} is an operation that does primitive value arithmetic without side
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BeginNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BeginNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginNode.java
index ecaa923e53da..c2b43b217659 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BeginNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class BeginNode extends AbstractBeginNode implements Simplifiable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
index e75acc541657..458d4a3d2d9b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BeginStateSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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;
 
 /**
  * Base class for {@link AbstractBeginNode}s that are associated with a frame state.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
index dcfea8ba4f84..9b9973b949e2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BinaryOpLogicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BreakpointNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BreakpointNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BreakpointNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BreakpointNode.java
index 309fb65a7751..7dcd5da352a7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/BreakpointNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BreakpointNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * A node that results in a platform-dependent breakpoint instruction being emitted. A number of
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CallTargetNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CallTargetNode.java
index ade283c31553..591b9fec880c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CallTargetNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Cancellable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Cancellable.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Cancellable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Cancellable.java
index 9796d5c2d4f5..6d60f7c4d762 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Cancellable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Cancellable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.CancellationBailoutException;
+import jdk.compiler.graal.core.common.CancellationBailoutException;
 
 /**
  * An interface for supporting co-operative cancellation of tasks. An external entity gives a
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
index 669d552f34ea..2c2db96d4c14 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CanonicalizableLocation.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.nodes.spi.CoreProviders;
+import jdk.compiler.graal.nodes.spi.CoreProviders;
 
 public interface CanonicalizableLocation {
     ValueNode canonicalizeRead(ValueNode read, ValueNode object, ValueNode offset, CoreProviders tool);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CompanionObjectEncoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CompanionObjectEncoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
index 5b23b770ae99..8cd1663af12d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CompanionObjectEncoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.graph.Node;
+import jdk.compiler.graal.graph.Node;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CompressionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompressionNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CompressionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompressionNode.java
index c6751981970e..77bdea0ee938 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/CompressionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompressionNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.ConvertNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.type.StampTool;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
index 56f2b962205b..9d73dfd046fa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ComputeObjectAddressNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
index bc6b3f92af20..d332455d75eb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ConditionAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Condition;
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/nodes/ConstantNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConstantNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ConstantNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConstantNode.java
index 9373aeda6a4a..658aa7587298 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ConstantNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConstantNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ControlSinkNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSinkNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ControlSinkNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSinkNode.java
index e8a9a231023b..6205aa93daca 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ControlSinkNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSinkNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 @NodeInfo
 public abstract class ControlSinkNode extends FixedNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ControlSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSplitNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ControlSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSplitNode.java
index 3fd65fd110b4..9299b6383175 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ControlSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSplitNode.java
@@ -22,13 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
+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;
 
 /**
  * The {@code ControlSplitNode} is a base class for all instructions that split the control flow
@@ -50,7 +49,7 @@ protected ControlSplitNode(NodeClass c, Stamp stamp)
      * successful, sets the source of the knowledge about probabilities according to the
      * {@code profileData}'s profile source.
      */
-    public abstract boolean setProbability(AbstractBeginNode successor, BranchProbabilityData profileData);
+    public abstract boolean setProbability(AbstractBeginNode successor, ProfileData.BranchProbabilityData profileData);
 
     /**
      * Returns an array containing the successors' probabilities. The positions in the array
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeadEndNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeadEndNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeadEndNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeadEndNode.java
index 7b02d19cde6b..f55f17da36bd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeadEndNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeadEndNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 /**
  * Control sink that should be never be reached because the previous node will never follow the edge
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptBciSupplier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptBciSupplier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
index 6fbe956effc4..5bbe75868f7e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptBciSupplier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 /**
  * A marker interface for nodes that represent operations that can deoptimize and thus need a BCI to
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
index 52d95751cf22..137bae3fc3d9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
index ec1be2075726..5726ca578c4c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingFixedWithNextNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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;
 
 @NodeInfo
 public abstract class DeoptimizingFixedWithNextNode extends FixedWithNextNode implements DeoptimizingNode.DeoptBefore {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
index 366c76fc6791..85e892aeab6f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingGuard.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.compiler.graal.nodes.extended.GuardingNode;
 
 /**
  * Shared interface to capture core methods of {@link AbstractFixedGuardNode} and {@link GuardNode}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
index 6d1abc2cd21a..03bb2235d59d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DeoptimizingNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.nodes.spi.NodeWithState;
+import jdk.compiler.graal.nodes.spi.NodeWithState;
 
 /**
  * Interface implemented by nodes which may need {@linkplain FrameState deoptimization information}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
index c49ab2002008..bf56e0ad8dd1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DirectCallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.StampPair;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
index d943546dede3..7b5887815e7f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DynamicDeoptimizeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DynamicPiNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicPiNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DynamicPiNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicPiNode.java
index 9ee46b058c89..b94da1ae79c1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/DynamicPiNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicPiNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -85,7 +85,7 @@ private static ValueNode findSynonym(Assumptions assumptions, ConstantReflection
                         staticPiStamp = StampFactory.objectNonNull(type);
                     }
                 }
-                return PiNode.create(object, staticPiStamp, (ValueNode) guard);
+                return create(object, staticPiStamp, (ValueNode) guard);
             }
         }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EncodedGraph.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EncodedGraph.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EncodedGraph.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EncodedGraph.java
index c228a1a44def..600493d6294e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EncodedGraph.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EncodedGraph.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.List;
 import java.util.Objects;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.graph.NodeClass;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EndNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EndNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EndNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EndNode.java
index 742878bb4fed..537c78312025 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EndNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EndNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.InputType;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 @NodeInfo(allowedUsageTypes = {InputType.Association}, nameTemplate = "End")
 public final class EndNode extends AbstractEndNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EntryMarkerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EntryMarkerNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
index 539153733174..640ac94a1003 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EntryMarkerNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * This node will be inserted at point specified by {@link StructuredGraph#getEntryBCI()}, usually
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EntryProxyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryProxyNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EntryProxyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryProxyNode.java
index 5b8dc4bc9b27..1c697fd86013 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/EntryProxyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryProxyNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
+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;
 
 /**
  * Proxy node that is used in OSR. This node drops the stamp information from the value, since the
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
index 69987a75297a..5d675ae5a244 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FieldLocationIdentity.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import jdk.vm.ci.meta.JavaKind.FormatWithToString;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedGuardNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedGuardNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedGuardNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedGuardNode.java
index 694dd76bc988..5a37c334356c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedGuardNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedGuardNode.java
@@ -22,25 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.SwitchFoldable;
+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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
@@ -206,8 +205,8 @@ public boolean isNonInitializedProfile() {
     }
 
     @Override
-    public ProfileSource profileSource() {
-        return ProfileSource.INJECTED;
+    public ProfileData.ProfileSource profileSource() {
+        return ProfileData.ProfileSource.INJECTED;
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNode.java
index 3622f10cddcc..65a6da895725 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 @NodeInfo
 public abstract class FixedNode extends ValueNode implements FixedNodeInterface {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedNodeInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedNodeInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
index e3049468f1cc..21b1bd9b6329 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedNodeInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 /**
  * See {@link ValueNodeInterface} for details about these node interfaces.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedWithNextNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedWithNextNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
index 1a610b3743c8..2ddb32184cb5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedWithNextNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
index 184265475c42..622d4683dae8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FixedWithNextNodeInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 /**
  * See {@link ValueNodeInterface} for details about these node interfaces.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
index da1af4e10550..bf7be387ddc6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FloatingAnchoredNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
+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;
 
 @NodeInfo
 public abstract class FloatingAnchoredNode extends FloatingNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
index b2417647dbff..d40300fd3f18 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FloatingGuardedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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;
 
 @NodeInfo
 public abstract class FloatingGuardedNode extends FloatingNode implements GuardedNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FrameState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FrameState.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FrameState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FrameState.java
index 629ea2413002..ed80956a0355 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FrameState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FrameState.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.getPlaceholderBciName;
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+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 java.util.ArrayList;
 import java.util.Arrays;
@@ -40,24 +40,24 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.Bytecodes;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.virtual.EscapeObjectState;
-import org.graalvm.compiler.nodes.virtual.MaterializedObjectState;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.CodeUtil;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FullInfopointNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FullInfopointNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FullInfopointNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FullInfopointNode.java
index b4b3dffe2b81..d02f7a7a4bd3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/FullInfopointNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FullInfopointNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.NodeWithState;
+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.vm.ci.code.site.InfopointReason;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
index d495fe9b6b68..c947238439a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GetObjectAddressNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphDecoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphDecoder.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphDecoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphDecoder.java
index e7ea09f9d681..ce8962ff2e28 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphDecoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphDecoder.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+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 java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -40,41 +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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.Fields;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.util.TypeReader;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeReader;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeList;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.NodeSuccessorList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.EncodedGraph.EncodedNodeReference;
-import org.graalvm.compiler.nodes.GraphDecoder.MethodScope;
-import org.graalvm.compiler.nodes.GraphDecoder.ProxyPlaceholder;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.nodes.MethodHandleWithExceptionNode;
+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.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.Assumptions;
@@ -116,7 +113,7 @@ protected class MethodScope {
         /** Access to the encoded graph. */
         public final TypeReader reader;
         /** The kind of loop explosion to be performed during decoding. */
-        public final LoopExplosionKind loopExplosion;
+        public final LoopExplosionPlugin.LoopExplosionKind loopExplosion;
 
         /** All return nodes encountered during decoding. */
         public final List returnAndUnwindNodes;
@@ -126,7 +123,8 @@ protected class MethodScope {
 
         /**
          * The start of explosion, and the merge point for when irreducible loops are detected. Only
-         * used when {@link MethodScope#loopExplosion} is {@link LoopExplosionKind#MERGE_EXPLODE}.
+         * used when {@link MethodScope#loopExplosion} is
+         * {@link LoopExplosionPlugin.LoopExplosionKind#MERGE_EXPLODE}.
          */
         public MergeNode loopExplosionHead;
 
@@ -152,7 +150,7 @@ protected class MethodScope {
         public InliningLogCodec.InliningLogDecoder inliningLogDecoder;
 
         @SuppressWarnings("unchecked")
-        protected MethodScope(LoopScope callerLoopScope, StructuredGraph graph, EncodedGraph encodedGraph, LoopExplosionKind loopExplosion) {
+        protected MethodScope(LoopScope callerLoopScope, StructuredGraph graph, EncodedGraph encodedGraph, LoopExplosionPlugin.LoopExplosionKind loopExplosion) {
             this.callerLoopScope = callerLoopScope;
             this.methodStartMark = graph.getMark();
             this.encodedGraph = encodedGraph;
@@ -163,7 +161,7 @@ protected MethodScope(LoopScope callerLoopScope, StructuredGraph graph, EncodedG
                 reader = UnsafeArrayTypeReader.create(encodedGraph.getEncoding(), encodedGraph.getStartOffset(), architecture.supportsUnalignedMemoryAccess());
                 maxFixedNodeOrderId = reader.getUVInt();
                 GraphState.GuardsStage guardsStage = (GraphState.GuardsStage) readObject(this);
-                EnumSet stageFlags = (EnumSet) readObject(this);
+                EnumSet stageFlags = (EnumSet) readObject(this);
                 if (callerLoopScope == null) {
                     /**
                      * Only propagate stage flags in non-inlining scenarios. If the caller scope has
@@ -248,21 +246,24 @@ public enum LoopScopeTrigger {
 
         /**
          * Loop scope created for the next iteration of a loop if unrolling is enabled in the loop
-         * explosion mode. See {@link LoopExplosionKind#unrollLoops()} for details. Loop unrolling
-         * will merge loop end nodes for each iteration of the original loop.
+         * explosion mode. See {@link LoopExplosionPlugin.LoopExplosionKind#unrollLoops()} for
+         * details. Loop unrolling will merge loop end nodes for each iteration of the original
+         * loop.
          */
         LOOP_BEGIN_UNROLLING,
 
         /**
          * Loop scope created for the next iteration of a loop along a particular loop end node if
-         * {@link LoopExplosionKind#duplicateLoopEnds()} is enabled and loops are exploded. This
-         * means for every loop end we duplicate the next loop iteration of the original loop.
+         * {@link LoopExplosionPlugin.LoopExplosionKind#duplicateLoopEnds()} is enabled and loops
+         * are exploded. This means for every loop end we duplicate the next loop iteration of the
+         * original loop.
          */
         LOOP_END_DUPLICATION,
 
         /**
-         * Loop scope created for a loop exit node if {@link LoopExplosionKind#duplicateLoopExits()}
-         * is enabled, i.e., code after a loop exit is duplicated per loop exit node.
+         * Loop scope created for a loop exit node if
+         * {@link LoopExplosionPlugin.LoopExplosionKind#duplicateLoopExits()} is enabled, i.e., code
+         * after a loop exit is duplicated per loop exit node.
          *
          * Special case nested loops: For compilation units with nested loops where inner loops
          * continue loops at a level n -1 the partial evaluation algorithm will merge outer loops to
@@ -286,25 +287,25 @@ protected static class LoopScope {
         /**
          * Upcoming, not yet processed, loop iterations created in the context of code duplication
          * along loop exits. Only used when {@link MethodScope#loopExplosion} has
-         * {@link LoopExplosionKind#duplicateLoopExits()} enabled.
+         * {@link LoopExplosionPlugin.LoopExplosionKind#duplicateLoopExits()} enabled.
          */
         public Deque nextIterationFromLoopExitDuplication;
         /**
          * Same as {@link #nextIterationFromLoopExitDuplication} except that upcoming iterations
          * have been created because the duplication of loop ends
-         * {@link LoopExplosionKind#duplicateLoopEnds()} is enabled.
+         * {@link LoopExplosionPlugin.LoopExplosionKind#duplicateLoopEnds()} is enabled.
          */
         public Deque nextIterationFromLoopEndDuplication;
         /**
          * Same as {@link #nextIterationFromLoopExitDuplication} except that upcoming iterations
          * have been created because the unrolling of a loop with constant iteration count
-         * {@link LoopExplosionKind#unrollLoops()} is enabled.
+         * {@link LoopExplosionPlugin.LoopExplosionKind#unrollLoops()} is enabled.
          */
         public Deque nextIterationsFromUnrolling;
         /**
          * Information about already processed loop iterations for state merging during loop
          * explosion. Only used when {@link MethodScope#loopExplosion} is
-         * {@link LoopExplosionKind#MERGE_EXPLODE}.
+         * {@link LoopExplosionPlugin.LoopExplosionKind#MERGE_EXPLODE}.
          */
         public final EconomicMap iterationStates;
         public final int loopBeginOrderId;
@@ -319,7 +320,7 @@ protected static class LoopScope {
         /**
          * Nodes that have been created in outer loop scopes and existed before starting to process
          * this loop, indexed by the orderId. Only used when {@link MethodScope#loopExplosion} is
-         * not {@link LoopExplosionKind#NONE}.
+         * not {@link LoopExplosionPlugin.LoopExplosionKind#NONE}.
          */
         public final Node[] initialCreatedNodes;
 
@@ -496,9 +497,9 @@ public InvokeData(Invoke invoke, ResolvedJavaType contextType, int invokeOrderId
     }
 
     /**
-     * A node that is created during {@link LoopExplosionKind#MERGE_EXPLODE loop explosion} that can
-     * later be replaced by a ProxyNode if {@link LoopDetector loop detection} finds out that the
-     * value is defined in the loop, but used outside the loop.
+     * A node that is created during {@link LoopExplosionPlugin.LoopExplosionKind#MERGE_EXPLODE loop
+     * explosion} that can later be replaced by a ProxyNode if {@link LoopDetector loop detection}
+     * finds out that the value is defined in the loop, but used outside the loop.
      */
     @NodeInfo(cycles = CYCLES_IGNORED, size = SIZE_IGNORED)
     protected static final class ProxyPlaceholder extends FloatingNode implements Canonicalizable {
@@ -561,10 +562,10 @@ public final void decode(EncodedGraph encodedGraph) {
     }
 
     @SuppressWarnings("try")
-    public final void decode(EncodedGraph encodedGraph, Iterable nodeReferences) {
+    public final void decode(EncodedGraph encodedGraph, Iterable nodeReferences) {
         try (DebugContext.Scope scope = debug.scope("GraphDecoder", graph)) {
             recordGraphElements(encodedGraph);
-            MethodScope methodScope = new MethodScope(null, graph, encodedGraph, LoopExplosionKind.NONE);
+            MethodScope methodScope = new MethodScope(null, graph, encodedGraph, LoopExplosionPlugin.LoopExplosionKind.NONE);
             LoopScope loopScope = createInitialLoopScope(methodScope, null);
             decode(loopScope);
             cleanupGraph(methodScope);
@@ -579,7 +580,7 @@ public final void decode(EncodedGraph encodedGraph, Iterable dispatchTable, AbstractBeginNode defaultSuccessor) {
@@ -2533,7 +2535,7 @@ private static IntegerSwitchNode createSwitch(ValuePhiNode switchedValue, Sorted
         switchKeyProbabilities[idx] = 0;
         switchKeySuccessors[idx] = idx;
 
-        return new IntegerSwitchNode(switchedValue, switchSuccessors, switchKeys, switchKeySuccessors, SwitchProbabilityData.unknown(switchKeyProbabilities));
+        return new IntegerSwitchNode(switchedValue, switchSuccessors, switchKeys, switchKeySuccessors, ProfileData.SwitchProbabilityData.unknown(switchKeyProbabilities));
     }
 
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphEncoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphEncoder.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphEncoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphEncoder.java
index 7291a046b19f..feb3058934be 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphEncoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphEncoder.java
@@ -22,32 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.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 org.graalvm.collections.Pair;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import org.graalvm.compiler.core.common.Fields;
-import org.graalvm.compiler.core.common.util.FrequencyEncoder;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.TypeReader;
-import org.graalvm.compiler.core.common.util.TypeWriter;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeList;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.EncodedGraph.EncodedNodeReference;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.replacements.nodes.MethodHandleWithExceptionNode;
+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.vm.ci.code.Architecture;
 
@@ -178,7 +177,7 @@ public static EncodedGraph encodeSingleGraph(StructuredGraph graph, Architecture
     /**
      * Utility method that does everything necessary to encode a single graph.
      */
-    public static EncodedGraph encodeSingleGraph(StructuredGraph graph, Architecture architecture, Iterable nodeReferences) {
+    public static EncodedGraph encodeSingleGraph(StructuredGraph graph, Architecture architecture, Iterable nodeReferences) {
         GraphEncoder encoder = new GraphEncoder(architecture);
         encoder.prepare(graph);
         encoder.finishPrepare();
@@ -250,7 +249,7 @@ public int encode(StructuredGraph graph) {
         return encode(graph, null);
     }
 
-    protected int encode(StructuredGraph graph, Iterable nodeReferences) {
+    protected int encode(StructuredGraph graph, Iterable nodeReferences) {
         assert objectsArray != null && nodeClassesArray != null : "finishPrepare() must be called before encode()";
 
         NodeOrder nodeOrder = new NodeOrder(graph);
@@ -260,7 +259,7 @@ protected int encode(StructuredGraph graph, Iterable nodeR
 
         if (nodeReferences != null) {
             for (var nodeReference : nodeReferences) {
-                if (nodeReference.orderId != EncodedNodeReference.DECODED) {
+                if (nodeReference.orderId != EncodedGraph.EncodedNodeReference.DECODED) {
                     throw GraalError.shouldNotReachHere("EncodedNodeReference is not in 'decoded' state"); // ExcludeFromJacocoGeneratedReport
                 }
                 nodeReference.orderId = nodeOrder.orderIds.get(nodeReference.node);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphState.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphState.java
index 6744af60a81c..60075cc387e6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GraphState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphState.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.EnumSet;
 import java.util.Formatter;
 import java.util.Objects;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.SpeculationLog;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardNode.java
index 19466d1d153e..73abcd0d6c4c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Condition;
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardPhiNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardPhiNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardPhiNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardPhiNode.java
index acfc8e1544fa..117f7f3b375b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardPhiNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardPhiNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 /**
  * Guard {@link PhiNode}s merge guard dependencies at control flow merges.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardProxyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardProxyNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardProxyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardProxyNode.java
index dca8ae8328bc..614c5da662c5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardProxyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardProxyNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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;
 
 @NodeInfo(allowedUsageTypes = {InputType.Guard}, nameTemplate = "GuardProxy({i#value})")
 public final class GuardProxyNode extends ProxyNode implements GuardingNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardedValueNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardedValueNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardedValueNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardedValueNode.java
index 473008c02976..67693c243b51 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/GuardedValueNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardedValueNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/IfNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IfNode.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/IfNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IfNode.java
index 4f3e7dc8b1dd..20ea6c817be5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/IfNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IfNode.java
@@ -22,66 +22,66 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatNormalizeCompareNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.calc.IntegerNormalizeCompareNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.UnboxNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.memory.MemoryAnchorNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.SwitchFoldable;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
@@ -2237,7 +2237,7 @@ private static void propagateInjectedProfile(BranchProbabilityData profile, EndN
     /**
      * Connects a set of ends to a given successor, inserting a merge node if there is more than one
      * end. If {@code ends} is not empty, then {@code successor} is added to {@code tool}'s
-     * {@linkplain SimplifierTool#addToWorkList(org.graalvm.compiler.graph.Node) work list}.
+     * {@linkplain SimplifierTool#addToWorkList(Node) work list}.
      *
      * @param phi the original single-usage phi of the preceding merge
      * @param phiValues the values of the phi at the merge, keyed by the merge ends
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ImplicitNullCheckNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ImplicitNullCheckNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
index 1b609747026e..7a2d588f49e9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ImplicitNullCheckNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
index 83458c7cfebc..f445ab384d48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/IndirectCallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.StampPair;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InliningLog.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLog.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InliningLog.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLog.java
index 2ccaf7d29775..e5433145dc4f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InliningLog.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLog.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.graph.Node;
 
 import jdk.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
-import org.graalvm.util.CollectionsUtil;
+import jdk.compiler.graal.util.CollectionsUtil;
 
 /**
  * This class contains all inlining decisions performed on a graph during the compilation.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InliningLogCodec.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLogCodec.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InliningLogCodec.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLogCodec.java
index 9baf51ab79ad..12dccc6a136e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InliningLogCodec.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLogCodec.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.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 org.graalvm.compiler.graph.Node;
-import org.graalvm.util.CollectionsUtil;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.util.CollectionsUtil;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Invokable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invokable.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Invokable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invokable.java
index e07553468ddd..a8e330309834 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Invokable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invokable.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.graph.Node;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Invoke.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invoke.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Invoke.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invoke.java
index 28cf66556de7..457b54e7f6c7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/Invoke.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invoke.java
@@ -22,14 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
@@ -129,7 +128,7 @@ default ResolvedJavaType getReceiverType() {
         return receiverType;
     }
 
-    default InvokeKind getInvokeKind() {
+    default CallTargetNode.InvokeKind getInvokeKind() {
         return callTarget().invokeKind();
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InvokeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InvokeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeNode.java
index a9c0a7d525b9..1063c74c9d4e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InvokeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeNode.java
@@ -22,36 +22,36 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static org.graalvm.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
-import static org.graalvm.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
+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;
 
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
index 0d7103fc0a23..1c74b11615e5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/InvokeWithExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static org.graalvm.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
-import static org.graalvm.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
+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 java.util.Map;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LIRLowerableLogicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LIRLowerableLogicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
index 4c9bd601965d..6d55a51f1d7d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LIRLowerableLogicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 static org.graalvm.compiler.nodeinfo.InputType.Condition;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.InputType.Condition;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 @NodeInfo(allowedUsageTypes = {Condition}, size = SIZE_1)
 public abstract class LIRLowerableLogicNode extends LogicNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicConstantNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicConstantNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicConstantNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicConstantNode.java
index f2a2448ea776..b66bebf6e633 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicConstantNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicConstantNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
+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;
 
 /**
  * The {@code LogicConstantNode} represents a boolean constant.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicNegationNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNegationNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicNegationNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNegationNode.java
index 7d288d64062e..26645e195ba2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicNegationNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNegationNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Condition;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNode.java
index 46fa9a015051..e6eb520073f5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LogicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Condition;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.InputType.Condition;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
+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.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopBeginNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopBeginNode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopBeginNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopBeginNode.java
index bce5199fcf37..67dc2cd9cacb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopBeginNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopBeginNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.graph.iterators.NodePredicates.isNotA;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
+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;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopEndNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopEndNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopEndNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopEndNode.java
index 474f77cc0d94..7e4426f437aa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopEndNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopEndNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+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 java.util.Collections;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * LoopEnd nodes represent a loop back-edge. When a LoopEnd is reached, execution continues at the
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopExitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopExitNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopExitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopExitNode.java
index 527926425152..43a93a02d981 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoopExitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopExitNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
-
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 @NodeInfo(allowedUsageTypes = {Association}, cycles = CYCLES_0, size = SIZE_4)
 public final class LoopExitNode extends BeginStateSplitNode implements IterableNodeType, Simplifiable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
index 57fd4a37de09..0caad8e67963 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/LoweredCallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.core.common.type.StampPair;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 import jdk.vm.ci.code.CallingConvention;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MemoryMapControlSinkNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MemoryMapControlSinkNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
index 11ba15a8ba6d..e2a0e04020f7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MemoryMapControlSinkNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
+import static jdk.compiler.graal.nodeinfo.InputType.Extension;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.MemoryMapNode;
+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;
 
 /**
  * {@link ControlSinkNode}that might have a {@link MemoryMapNode} attached. This map can be used to
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MemoryProxyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MemoryProxyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
index 9709147afcb9..cbc622d4c1de 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MemoryProxyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+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 org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = {InputType.Memory}, nameTemplate = "MemoryProxy({i#value})")
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MergeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MergeNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MergeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MergeNode.java
index b105cc61fb86..5ae3bf683dac 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/MergeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MergeNode.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
 
 /**
  * Denotes the merging of multiple control-flow paths.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
index c7c88f9d120d..571ada5d4e3d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/NamedLocationIdentity.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.EnumMap;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/NodeView.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NodeView.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/NodeView.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NodeView.java
index 8e0bddacb65f..ae5a939a6c0f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/NodeView.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NodeView.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.nodes.spi.CanonicalizerTool;
 
 /**
  * Interface that overrides properties of a node, such as the node's stamp.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLog.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLog.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLog.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLog.java
index 64403dd81117..5f26328c3962 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLog.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLog.java
@@ -22,25 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ResolvedJavaMethod;
 
@@ -100,10 +101,9 @@ interface OptimizationEntry {
          OptimizationEntry withLazyProperty(String key, Supplier valueSupplier);
 
         /**
-         * Increments a {@link org.graalvm.compiler.debug.CounterKey counter},
-         * {@link DebugContext#log(String) logs} at {@link DebugContext#DETAILED_LEVEL},
-         * {@link DebugContext#dump(int, Object, String) dumps} at
-         * {@link DebugContext#DETAILED_LEVEL} and appends to the optimization log if each
+         * Increments a {@link CounterKey counter}, {@link DebugContext#log(String) logs} at
+         * {@link DebugContext#DETAILED_LEVEL}, {@link DebugContext#dump(int, Object, String) dumps}
+         * at {@link DebugContext#DETAILED_LEVEL} and appends to the optimization log if each
          * respective feature is enabled. This method is equivalent to
          * {@link #report(int, Class, String, Node)} at {@link DebugContext#DETAILED_LEVEL}.
          *
@@ -116,10 +116,9 @@ default void report(Class optimizationClass, String eventName, Node node) {
         }
 
         /**
-         * Increments a {@link org.graalvm.compiler.debug.CounterKey counter},
-         * {@link DebugContext#log(String) logs} at the specified level,
-         * {@link DebugContext#dump(int, Object, String) dumps} at the specified level and appends
-         * to the optimization log if each respective feature is enabled.
+         * Increments a {@link CounterKey counter}, {@link DebugContext#log(String) logs} at the
+         * specified level, {@link DebugContext#dump(int, Object, String) dumps} at the specified
+         * level and appends to the optimization log if each respective feature is enabled.
          *
          * @param logLevel the log level to use for logging and dumping (e.g.
          *            {@link DebugContext#DETAILED_LEVEL})
@@ -367,12 +366,11 @@ static OptimizationLog getInstance(StructuredGraph graph) {
      OptimizationEntry withLazyProperty(String key, Supplier valueSupplier);
 
     /**
-     * Increments a {@link org.graalvm.compiler.debug.CounterKey counter},
-     * {@link DebugContext#log(String) logs} at {@link DebugContext#DETAILED_LEVEL},
-     * {@link DebugContext#dump(int, Object, String) dumps} at {@link DebugContext#DETAILED_LEVEL}
-     * and adds a node to the optimization tree if each respective feature is enabled. This method
-     * is equivalent to {@link #report(int, Class, String, Node)} at
-     * {@link DebugContext#DETAILED_LEVEL}.
+     * Increments a {@link CounterKey counter}, {@link DebugContext#log(String) logs} at
+     * {@link DebugContext#DETAILED_LEVEL}, {@link DebugContext#dump(int, Object, String) dumps} at
+     * {@link DebugContext#DETAILED_LEVEL} and adds a node to the optimization tree if each
+     * respective feature is enabled. This method is equivalent to
+     * {@link #report(int, Class, String, Node)} at {@link DebugContext#DETAILED_LEVEL}.
      *
      * If you want to associate a named property with the performed optimization, start by calling
      * {@link #withProperty(String, Object)} or {@link #withLazyProperty(String, Supplier)} and then
@@ -388,10 +386,9 @@ default void report(Class optimizationClass, String eventName, Node node) {
     }
 
     /**
-     * Increments a {@link org.graalvm.compiler.debug.CounterKey counter},
-     * {@link DebugContext#log(String) logs} at the specified level,
-     * {@link DebugContext#dump(int, Object, String) dumps} at the specified level and adds a node
-     * to the optimization tree if each respective feature is enabled.
+     * Increments a {@link CounterKey counter}, {@link DebugContext#log(String) logs} at the
+     * specified level, {@link DebugContext#dump(int, Object, String) dumps} at the specified level
+     * and adds a node to the optimization tree if each respective feature is enabled.
      *
      * If you want to associate a named property with the performed optimization, start by calling
      * {@link #withProperty(String, Object)} or {@link #withLazyProperty(String, Supplier)} and then
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLogCodec.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLogCodec.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
index 963b9ebe5fbb..e4f8a2203574 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLogCodec.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicMapUtil;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.util.CollectionsUtil;
+import jdk.compiler.graal.graph.Graph;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.util.CollectionsUtil;
 
 /**
  * Encodes and decodes the {@link OptimizationLog}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLogImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLogImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
index bd4c64c7278a..3ac96b3fecf2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/OptimizationLogImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.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 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.PathUtilities;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.NodeSuccessorList;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.IsolateUtil;
-import org.graalvm.util.json.JSONFormatter;
+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.vm.ci.meta.JavaTypeProfile;
 import jdk.vm.ci.meta.ProfilingInfo;
@@ -429,7 +429,7 @@ public OptimizationEntry withProperty(String key, Object value) {
 
         @Override
         public void report(int logLevel, Class optimizationClass, String eventName, Node node) {
-            assert logLevel >= OptimizationLog.MINIMUM_LOG_LEVEL;
+            assert logLevel >= MINIMUM_LOG_LEVEL;
             String optimizationName = createOptimizationName(optimizationClass);
             NodeSourcePosition position = node.getNodeSourcePosition();
             DebugContext debug = optimizationLog.graph.getDebug();
@@ -490,7 +490,7 @@ public void report(int logLevel, Class optimizationClass, String eventName, N
 
     /**
      * Constructs an optimization log bound with a given graph. Optimization
-     * {@link org.graalvm.compiler.nodes.OptimizationLog.OptimizationEntry entries} are stored iff
+     * {@link OptimizationLog.OptimizationEntry entries} are stored iff
      * {@link DebugOptions#OptimizationLog} is enabled.
      *
      * @param graph the bound graph
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ParameterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ParameterNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ParameterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ParameterNode.java
index cbb9256d1306..382dc8cf07b2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ParameterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ParameterNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
+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;
 
 /**
  * The {@code Parameter} instruction is a placeholder for an incoming argument to a function call.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PauseNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PauseNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PauseNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PauseNode.java
index 544338cf072c..4589c3cec14f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PauseNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PauseNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /** A node that results in a platform dependent pause instruction being emitted. */
 // @formatter:off
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PhiNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PhiNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PhiNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PhiNode.java
index c8dbef8b105d..a4be7ed3039d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PhiNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PhiNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 /**
  * {@code PhiNode}s represent the merging of edges at a control flow merges (
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PiArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiArrayNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PiArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiArrayNode.java
index 631fb9037c84..1e138d7d4c9f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PiArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiArrayNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.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.vm.ci.meta.ConstantReflectionProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * A {@link PiNode} that also provides an array length in addition to a more refined stamp. A usage
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PiNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PiNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiNode.java
index 7568bbc54361..7e602d195a9e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PiNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
index 78b9a1c0f502..6ade3a25e0b0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
 
 /**
  * Interface for nodes responsible for {@linkplain GraphBuilderContext#shouldDeferPlugin deferring}
- * {@linkplain org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin invocation plugin}
- * application.
+ * {@linkplain InvocationPlugin invocation plugin} application.
  */
 public interface PluginReplacementInterface extends FixedNodeInterface {
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
index 230623d1ab6d..abeed8a91f8f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
index e923b0c16ee1..5fdbdfb9602a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PluginReplacementWithExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
index 9d35995702c4..19351fd8a317 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/PrefetchAllocateNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
@@ -23,19 +23,19 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode.Address;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
 public final class PrefetchAllocateNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ProfileData.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProfileData.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ProfileData.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProfileData.java
index 94248388b0d9..91674bb3c4ca 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ProfileData.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProfileData.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Arrays;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ProxyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProxyNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ProxyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProxyNode.java
index 692d1f392f8f..6e1db325035b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ProxyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProxyNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ValueNumberable;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.spi.Proxy;
+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;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ReturnNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ReturnNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ReturnNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ReturnNode.java
index d2f6a0db38b3..abfcb6b8e0b4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ReturnNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ReturnNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.MemoryMapNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SafepointNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SafepointNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SafepointNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SafepointNode.java
index 9c6bd3a81ae0..14d056e74766 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SafepointNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SafepointNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Marks a position in the graph where a safepoint should be emitted.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
index c17cd920c38f..1bdb388ecc6b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ShortCircuitOrNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
@@ -22,25 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Condition;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.TriState;
@@ -52,9 +51,9 @@ public final class ShortCircuitOrNode extends LogicNode implements IterableNodeT
     @Input(Condition) LogicNode y;
     protected boolean xNegated;
     protected boolean yNegated;
-    protected BranchProbabilityData shortCircuitProbability;
+    protected ProfileData.BranchProbabilityData shortCircuitProbability;
 
-    protected ShortCircuitOrNode(LogicNode x, boolean xNegated, LogicNode y, boolean yNegated, BranchProbabilityData shortCircuitProbability) {
+    protected ShortCircuitOrNode(LogicNode x, boolean xNegated, LogicNode y, boolean yNegated, ProfileData.BranchProbabilityData shortCircuitProbability) {
         super(TYPE);
         this.x = x;
         this.xNegated = xNegated;
@@ -63,7 +62,7 @@ protected ShortCircuitOrNode(LogicNode x, boolean xNegated, LogicNode y, boolean
         this.shortCircuitProbability = shortCircuitProbability;
     }
 
-    public static LogicNode create(LogicNode x, boolean xNegated, LogicNode y, boolean yNegated, BranchProbabilityData shortCircuitProbability) {
+    public static LogicNode create(LogicNode x, boolean xNegated, LogicNode y, boolean yNegated, ProfileData.BranchProbabilityData shortCircuitProbability) {
         LogicNode canonical = canonicalize(null, null, shortCircuitProbability, x, xNegated, y, yNegated);
         if (canonical != null) {
             return canonical;
@@ -93,11 +92,11 @@ public boolean isYNegated() {
      * Gets the probability that the {@link #getY() y} part of this binary node is not
      * evaluated. This is the probability that this operator will short-circuit its execution.
      */
-    public BranchProbabilityData getShortCircuitProbability() {
+    public ProfileData.BranchProbabilityData getShortCircuitProbability() {
         return shortCircuitProbability;
     }
 
-    protected static ShortCircuitOrNode canonicalizeNegation(LogicNode forX, boolean xNegated, LogicNode forY, boolean yNegated, BranchProbabilityData shortCircuitProbability) {
+    protected static ShortCircuitOrNode canonicalizeNegation(LogicNode forX, boolean xNegated, LogicNode forY, boolean yNegated, ProfileData.BranchProbabilityData shortCircuitProbability) {
         LogicNode xCond = forX;
         boolean xNeg = xNegated;
         while (xCond instanceof LogicNegationNode) {
@@ -128,7 +127,7 @@ public LogicNode canonical(CanonicalizerTool tool, LogicNode forX, LogicNode for
         return this;
     }
 
-    private static LogicNode canonicalize(ShortCircuitOrNode self, CanonicalizerTool tool, BranchProbabilityData shortCircuitProbability, LogicNode forX, boolean xNegated, LogicNode forY,
+    private static LogicNode canonicalize(ShortCircuitOrNode self, CanonicalizerTool tool, ProfileData.BranchProbabilityData shortCircuitProbability, LogicNode forX, boolean xNegated, LogicNode forY,
                     boolean yNegated) {
         ShortCircuitOrNode ret = canonicalizeNegation(forX, xNegated, forY, yNegated, shortCircuitProbability);
         if (ret != self && ret != null) {
@@ -240,7 +239,7 @@ private static LogicNode canonicalize(ShortCircuitOrNode self, CanonicalizerTool
             if (!yNode.isXNegated()) {
                 LogicNode sym = simplifyComparison(forX, yNode.getX());
                 if (sym != null) {
-                    BranchProbabilityData combinedProfile = BranchProbabilityData.combineShortCircuitOr(shortCircuitProbability, yNode.getShortCircuitProbability());
+                    ProfileData.BranchProbabilityData combinedProfile = ProfileData.BranchProbabilityData.combineShortCircuitOr(shortCircuitProbability, yNode.getShortCircuitProbability());
                     return new ShortCircuitOrNode(sym, xNegated, yNode.getY(), yNode.isYNegated(), combinedProfile);
                 }
             }
@@ -393,7 +392,7 @@ private static LogicNode optimizeShortCircuit(ShortCircuitOrNode inner, boolean
                 // (!( a || b) || a) => 1101 ( a ||!b)
                 boolean newInnerXNegated = inner.isXNegated();
                 boolean newInnerYNegated = inner.isYNegated();
-                BranchProbabilityData newProbability = inner.getShortCircuitProbability();
+                ProfileData.BranchProbabilityData newProbability = inner.getShortCircuitProbability();
                 if (matchIsInnerX) {
                     newInnerYNegated = !newInnerYNegated;
                 } else {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
index 22d2fa0e2398..75f9c413ad3d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SimplifyingGraphDecoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+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 java.util.List;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
similarity index 73%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
index 1f93a51304a5..616edd3294db 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SnippetAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Anchor;
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.InputType.Value;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/nodes/SpinWaitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SpinWaitNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SpinWaitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SpinWaitNode.java
index d631fe18e12f..ac5b6954008d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/SpinWaitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SpinWaitNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * A node that results in a platform dependent spin_wait instruction being emitted.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StartNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StartNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StartNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StartNode.java
index 638733ce8082..a938e4d722a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StartNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StartNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StateSplit.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StateSplit.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StateSplit.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StateSplit.java
index 665ac6219948..b9bca0f0774f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StateSplit.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StateSplit.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.nodes.spi.NodeWithState;
+import jdk.compiler.graal.nodes.spi.NodeWithState;
 
 /**
  * A state split is a node that may have a frame state associated with it.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StaticDeoptimizingNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StaticDeoptimizingNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
index ea1a8f8d8640..9b183cc90cee 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StaticDeoptimizingNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.debug.GraalError;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StructuredGraph.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StructuredGraph.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StructuredGraph.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StructuredGraph.java
index cec8f05702b0..ecd719a9a7a1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/StructuredGraph.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StructuredGraph.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -36,33 +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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.CancellationBailoutException;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.JavaMethodContext;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.ProfileProvider;
-import org.graalvm.compiler.nodes.spi.ResolvedJavaMethodProfileProvider;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.Assumptions;
@@ -1150,7 +1149,7 @@ public boolean hasVirtualizableAllocation() {
 
     @Override
     protected void afterRegister(Node node) {
-        assert !graphState.isAfterStage(StageFlag.VALUE_PROXY_REMOVAL) || !(node instanceof ValueProxyNode);
+        assert !graphState.isAfterStage(GraphState.StageFlag.VALUE_PROXY_REMOVAL) || !(node instanceof ValueProxyNode);
         if (inliningLog != null && node instanceof Invokable) {
             ((Invokable) node).updateInliningLogAfterRegister(this);
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/TypeCheckHints.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/TypeCheckHints.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/TypeCheckHints.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/TypeCheckHints.java
index 5c2ad1711f9a..7920cd98dfd9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/TypeCheckHints.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/TypeCheckHints.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Arrays;
 
-import org.graalvm.compiler.core.common.type.TypeReference;
+import jdk.compiler.graal.core.common.type.TypeReference;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
index 986db3f7cb1b..accd288b221e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnaryOpLogicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableBeginNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableBeginNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
index 7a6cfebbbc43..698e2b9d86a2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableBeginNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
@@ -22,13 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+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 org.graalvm.word.LocationIdentity;
 
 /**
@@ -48,10 +49,9 @@ public UnreachableBeginNode() {
     /**
      * Determine which memory location is killed by this node. Since this node can be used on the
      * {@linkplain WithExceptionNode#exceptionEdge() exception edge} of an {@link WithExceptionNode}
-     * that might also be a {@linkplain org.graalvm.compiler.nodes.memory.MemoryKill memory kill},
-     * this node must be a memory kill as well. Since the branch is unreachable and will be deleted
-     * eventually, killing {@link LocationIdentity#any()} do not cause issues with respect to
-     * optimizations.
+     * that might also be a {@linkplain MemoryKill memory kill}, this node must be a memory kill as
+     * well. Since the branch is unreachable and will be deleted eventually, killing
+     * {@link LocationIdentity#any()} do not cause issues with respect to optimizations.
      */
     @Override
     public LocationIdentity getKilledLocationIdentity() {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableControlSinkNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableControlSinkNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
index 8b9139fdeb94..3ae65c3a6f18 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableControlSinkNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
+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;
 
 /**
- * See also {@link org.graalvm.compiler.nodes.UnreachableBeginNode}.
+ * See also {@link UnreachableBeginNode}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_IGNORED, size = NodeSize.SIZE_IGNORED)
 public final class UnreachableControlSinkNode extends ControlSinkNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableNode.java
index 61e7cf495c85..6dcc63a83f34 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnreachableNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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;
 
 /**
  * Node for marking a branch in a snippet as unreachable. Usage example:
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnwindNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnwindNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnwindNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnwindNode.java
index 4d1a23c72c5b..11cf60952c28 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/UnwindNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnwindNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNode.java
index 024eef79f21c..9d362e919df6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Iterator;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeStack;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.graph.iterators.NodePredicate;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.spi.NodeValueMap;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaConstant;
@@ -51,7 +51,7 @@
  * instructions.
  */
 @NodeInfo
-public abstract class ValueNode extends org.graalvm.compiler.graph.Node implements ValueNodeInterface {
+public abstract class ValueNode extends Node implements ValueNodeInterface {
 
     public static final NodeClass TYPE = NodeClass.create(ValueNode.class);
 
@@ -230,10 +230,9 @@ protected boolean checkReplaceAtUsagesInvariants(Node other) {
 
     /**
      * Determines whether this node is recursively equal to the other node while ignoring
-     * differences in {@linkplain org.graalvm.compiler.graph.Node.Successor control-flow} edges and
-     * inputs of the given {@code ignoredInputType}. Recursive equality is only applied to
-     * {@link FloatingNode}s reachable via inputs; {@link FixedNode}s are only considered equal if
-     * they are the same node.
+     * differences in {@linkplain Node.Successor control-flow} edges and inputs of the given
+     * {@code ignoredInputType}. Recursive equality is only applied to {@link FloatingNode}s
+     * reachable via inputs; {@link FixedNode}s are only considered equal if they are the same node.
      *
      * WARNING: This method is useful only in very particular contexts, and only for limited
      * purposes. For example, it might be used to check if two values are equal up to memory or
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueNodeInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueNodeInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
index 528d4f86f5dc..fd68ff54deaf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueNodeInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 /**
  * When Graal {@link ValueNode} classes implement interfaces, it is frequently necessary to convert
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValuePhiNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValuePhiNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValuePhiNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValuePhiNode.java
index edafe4c68fa0..d1b4d3e92801 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValuePhiNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValuePhiNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeFlood;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.util.CollectionsUtil;
+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.type.StampTool;
+import jdk.compiler.graal.util.CollectionsUtil;
 
 /**
  * Value {@link PhiNode}s merge data flow values at control flow merges.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueProxyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueProxyNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueProxyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueProxyNode.java
index dd7af2774f8a..d0e6c482a9ae 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/ValueProxyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueProxyNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 @NodeInfo(nameTemplate = "ValueProxy({i#value})")
 public final class ValueProxyNode extends ProxyNode implements Canonicalizable, Virtualizable, ValueProxy {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/VirtualState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/VirtualState.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/VirtualState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/VirtualState.java
index 5a0e04a7a772..f1b4e77eab2d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/VirtualState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/VirtualState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
+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;
 
 /**
  * Base class for nodes that contain "virtual" state, like FrameState and VirtualObjectState.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/WithExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/WithExceptionNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/WithExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/WithExceptionNode.java
index 44917ac7de9b..fe70c9e4bc48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/WithExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/WithExceptionNode.java
@@ -22,15 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes;
+package jdk.compiler.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * Base class for fixed nodes that have exactly two successors: A "next" successor for normal
@@ -48,7 +47,7 @@ protected WithExceptionNode(NodeClass c, Stamp stam
     }
 
     private static final double EXCEPTION_PROBABILITY = 1e-5;
-    private static final BranchProbabilityData NORMAL_EXECUTION_PROFILE = BranchProbabilityData.injected(1 - EXCEPTION_PROBABILITY);
+    private static final ProfileData.BranchProbabilityData NORMAL_EXECUTION_PROFILE = ProfileData.BranchProbabilityData.injected(1 - EXCEPTION_PROBABILITY);
 
     @Successor protected AbstractBeginNode next;
     @Successor protected AbstractBeginNode exceptionEdge;
@@ -90,13 +89,13 @@ public double probability(AbstractBeginNode successor) {
     }
 
     @Override
-    public boolean setProbability(AbstractBeginNode successor, BranchProbabilityData profileData) {
+    public boolean setProbability(AbstractBeginNode successor, ProfileData.BranchProbabilityData profileData) {
         // Cannot set probability for nodes with exceptions.
         return false;
     }
 
     @Override
-    public BranchProbabilityData getProfileData() {
+    public ProfileData.BranchProbabilityData getProfileData() {
         return NORMAL_EXECUTION_PROFILE;
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AbsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbsNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AbsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbsNode.java
index 2803f324e436..c674f54a1600 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AbsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbsNode.java
@@ -22,24 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Abs;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 
@@ -51,7 +50,7 @@ public final class AbsNode extends UnaryArithmeticNode implements Arithmeti
     public static final NodeClass TYPE = NodeClass.create(AbsNode.class);
 
     public AbsNode(ValueNode x) {
-        super(TYPE, getArithmeticOpTable(x).getAbs(), x);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(x).getAbs(), x);
     }
 
     public static ValueNode create(ValueNode value, NodeView view) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AbstractNormalizeCompareNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AbstractNormalizeCompareNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
index 3dc441e9b6df..1c0fc86c9926 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AbstractNormalizeCompareNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AddNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AddNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AddNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AddNode.java
index 663f2e20b3c2..3d34a3ee3590 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AddNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AddNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Add;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
@@ -46,7 +46,7 @@
 import jdk.vm.ci.meta.Value;
 
 @NodeInfo(shortName = "+")
-public class AddNode extends BinaryArithmeticNode implements NarrowableArithmeticNode, BinaryCommutative {
+public class AddNode extends BinaryArithmeticNode implements NarrowableArithmeticNode, Canonicalizable.BinaryCommutative {
 
     public static final NodeClass TYPE = NodeClass.create(AddNode.class);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AndNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AndNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AndNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AndNode.java
index 35d7cf606a2c..b2d2faa78fc1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/AndNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AndNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
 
 @NodeInfo(shortName = "&")
-public final class AndNode extends BinaryArithmeticNode implements NarrowableArithmeticNode, BinaryCommutative {
+public final class AndNode extends BinaryArithmeticNode implements NarrowableArithmeticNode, Canonicalizable.BinaryCommutative {
 
     public static final NodeClass TYPE = NodeClass.create(AndNode.class);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
index fce811f91793..16474fd0069d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/BinaryArithmeticNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Set;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodePredicate;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ArithmeticOperation;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeValueMap;
+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.vm.ci.meta.Constant;
 
@@ -669,7 +669,7 @@ public static ValueNode reassociateMatchedValues(BinaryArithmeticNode node, N
             }
             return BinaryArithmeticNode.add(a, associated, view);
         } else if (isNonExactMul(node)) {
-            return BinaryArithmeticNode.mul(a, AddNode.mul(m1, m2, view), view);
+            return BinaryArithmeticNode.mul(a, mul(m1, m2, view), view);
         } else if (node instanceof AndNode) {
             return AndNode.create(a, AndNode.create(m1, m2, view), view);
         } else if (node instanceof OrNode) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/BinaryNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/BinaryNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
index 60b6bf48cf7e..5f51bb36eeac 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/BinaryNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * The {@code BinaryNode} class is the base of arithmetic and logic operations with two inputs.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CompareNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompareNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CompareNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompareNode.java
index 456b585e4545..1ee438045c82 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CompareNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompareNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CompressBitsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CompressBitsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
index 635bc6f86e7f..7c154a8cd053 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CompressBitsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Compress;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
index c0b8cddb2ca6..422319421f75 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ConditionalNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-import static org.graalvm.compiler.nodes.calc.CompareNode.createCompareNode;
+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 org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * The {@code ConditionalNode} class represents a comparison that yields one of two (eagerly
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ConvertNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ConvertNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
index 1b119671ecfb..5007ab4518f1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ConvertNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.core.common.calc.CanonicalCondition;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CopySignNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CopySignNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
index e92d985ff835..03e1a6696d38 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/CopySignNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ExpandBitsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ExpandBitsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
index fc2c3837c3b2..e306327ef68d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ExpandBitsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Expand;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
index 530ecc35ba4b..fc92c0da5f96 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FixedBinaryNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 @NodeInfo
 public abstract class FixedBinaryNode extends DeoptimizingFixedWithNextNode implements Canonicalizable.Binary {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
index 453234d922c6..b28b68b02382 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatConvertNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
@@ -22,27 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.FloatConvertOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -58,7 +57,7 @@ public final class FloatConvertNode extends UnaryArithmeticNode
     protected final FloatConvert op;
 
     public FloatConvertNode(FloatConvert op, ValueNode input) {
-        super(TYPE, getArithmeticOpTable(input).getFloatConvert(op), input);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(input).getFloatConvert(op), input);
         this.op = op;
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatDivNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatDivNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
index 6e0ea06d6cd7..c756c60eada7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatDivNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Div;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.Constant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
index 72607df559ac..a58434f1b6a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatEqualsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.TriState;
 
 @NodeInfo(shortName = "==", cycles = CYCLES_2)
-public final class FloatEqualsNode extends CompareNode implements BinaryCommutative {
+public final class FloatEqualsNode extends CompareNode implements Canonicalizable.BinaryCommutative {
     public static final NodeClass TYPE = NodeClass.create(FloatEqualsNode.class);
     private static final FloatEqualsOp OP = new FloatEqualsOp();
 
@@ -62,7 +62,7 @@ public FloatEqualsNode(ValueNode x, ValueNode y) {
     }
 
     public static LogicNode create(ValueNode x, ValueNode y, NodeView view) {
-        LogicNode result = CompareNode.tryConstantFoldPrimitive(CanonicalCondition.EQ, x, y, false, view);
+        LogicNode result = tryConstantFoldPrimitive(CanonicalCondition.EQ, x, y, false, view);
         if (result != null) {
             return result;
         } else {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
index 9f873da335de..4a174ecbcceb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatLessThanNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -61,7 +61,7 @@ public FloatLessThanNode(ValueNode x, ValueNode y, boolean unorderedIsTrue) {
     }
 
     public static LogicNode create(ValueNode x, ValueNode y, boolean unorderedIsTrue, NodeView view) {
-        LogicNode result = CompareNode.tryConstantFoldPrimitive(CanonicalCondition.LT, x, y, unorderedIsTrue, view);
+        LogicNode result = tryConstantFoldPrimitive(CanonicalCondition.LT, x, y, unorderedIsTrue, view);
         if (result != null) {
             return result;
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatNormalizeCompareNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatNormalizeCompareNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
index 8f240b53036e..d92a16be2aa6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatNormalizeCompareNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatTypeTestNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatTypeTestNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
index f2498ccb970c..7de5c69de129 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatTypeTestNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatingIntegerDivRemNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatingIntegerDivRemNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
index 4bbcec21a0a9..a99bf552d81c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatingIntegerDivRemNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
@@ -23,30 +23,30 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.MultiGuardNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
+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;
 
 /**
  * {@link FloatingNode} version of {@link IntegerDivRemNode} if it is known that this node cannot
@@ -148,7 +148,7 @@ public boolean verify() {
             // else unknown, we cannot prove this guard is unconditionally true or false
         }
         boolean cannotDeopt = (!canDivideByZero() && !overflowVisibleSideEffect());
-        boolean isAfterStage = graph().isAfterStage(StageFlag.FIXED_READS);
+        boolean isAfterStage = graph().isAfterStage(GraphState.StageFlag.FIXED_READS);
         GraalError.guarantee(guardWillAlwaysDeopt || cannotDeopt || isAfterStage, "Floating irem must never create an exception or trap");
         return super.verify();
     }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatingNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatingNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
index d4835479d322..bb14861e1f85 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/FloatingNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node.ValueNumberable;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 @NodeInfo
 public abstract class FloatingNode extends ValueNode implements ValueNumberable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
index 4ce422cc59bb..4660abb78c93 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerBelowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
index 29f6070b7348..5454093925a8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerConvertNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
@@ -22,26 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ArithmeticOperation;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.StampInverter;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -77,7 +75,7 @@ public int getResultBits() {
 
     @Override
     public final IntegerConvertOp getArithmeticOp() {
-        return getOp(getArithmeticOpTable(getValue()));
+        return getOp(BinaryArithmeticNode.getArithmeticOpTable(getValue()));
     }
 
     @Override
@@ -99,7 +97,7 @@ public Stamp foldStamp(Stamp newStamp) {
 
     @Override
     public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) {
-        ValueNode synonym = findSynonym(getOp(getArithmeticOpTable(forValue)), forValue, inputBits, resultBits, stamp(NodeView.DEFAULT));
+        ValueNode synonym = findSynonym(getOp(BinaryArithmeticNode.getArithmeticOpTable(forValue)), forValue, inputBits, resultBits, stamp(NodeView.DEFAULT));
         if (synonym != null) {
             return synonym;
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
index 6800cecd9198..3229f0ccf3a8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerDivRemNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
@@ -22,22 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 import jdk.vm.ci.meta.JavaConstant;
 
@@ -56,7 +57,7 @@ public enum Type {
         UNSIGNED
     }
 
-    @OptionalInput(InputType.Guard) private GuardingNode zeroGuard;
+    @Node.OptionalInput(InputType.Guard) private GuardingNode zeroGuard;
 
     private final Op op;
     private final Type type;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
index 97bcbc49e5ba..009e0466ffe6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerEqualsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -52,7 +52,7 @@
 import jdk.vm.ci.meta.TriState;
 
 @NodeInfo(shortName = "==")
-public final class IntegerEqualsNode extends CompareNode implements BinaryCommutative {
+public final class IntegerEqualsNode extends CompareNode implements Canonicalizable.BinaryCommutative {
     public static final NodeClass TYPE = NodeClass.create(IntegerEqualsNode.class);
     private static final IntegerEqualsOp OP = new IntegerEqualsOp();
 
@@ -66,7 +66,7 @@ public IntegerEqualsNode(ValueNode x, ValueNode y) {
     }
 
     public static LogicNode create(ValueNode x, ValueNode y, NodeView view) {
-        LogicNode result = CompareNode.tryConstantFoldPrimitive(CanonicalCondition.EQ, x, y, false, view);
+        LogicNode result = tryConstantFoldPrimitive(CanonicalCondition.EQ, x, y, false, view);
         if (result != null) {
             return result;
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
index 8cb9f2c270c5..575ccd3df43b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerLessThanNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.core.common.calc.CanonicalCondition.LT;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
index b28c11800e9e..a21d5529dd04 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerLowerThanNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
 import static jdk.vm.ci.code.CodeUtil.mask;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -174,7 +174,7 @@ protected long max(long a, long b, int bits) {
         protected abstract IntegerLowerThanNode createNode(ValueNode x, ValueNode y);
 
         public LogicNode create(ValueNode x, ValueNode y, NodeView view) {
-            LogicNode result = CompareNode.tryConstantFoldPrimitive(getCondition(), x, y, false, view);
+            LogicNode result = tryConstantFoldPrimitive(getCondition(), x, y, false, view);
             if (result != null) {
                 return result;
             } else {
@@ -193,7 +193,7 @@ public LogicNode create(ValueNode x, ValueNode y, NodeView view) {
          * @see #create
          */
         public LogicConstantNode constantOrNull(ValueNode x, ValueNode y, NodeView view) {
-            LogicNode result = CompareNode.tryConstantFoldPrimitive(getCondition(), x, y, false, view);
+            LogicNode result = tryConstantFoldPrimitive(getCondition(), x, y, false, view);
             if (result instanceof LogicConstantNode) {
                 return (LogicConstantNode) result;
             } else {
@@ -449,15 +449,15 @@ protected LogicNode canonicalizeCommonArithmetic(ValueNode forX, ValueNode forY,
 
         /**
          * Return {@code true} if the {@code a + b} can overflow w.r.t.
-         * {@linkplain org.graalvm.compiler.nodes.calc.IntegerLessThanNode.LessThanOp signed} or
-         * {@linkplain org.graalvm.compiler.nodes.calc.IntegerBelowNode.BelowOp unsigned} semantics.
+         * {@linkplain IntegerLessThanNode.LessThanOp signed} or
+         * {@linkplain IntegerBelowNode.BelowOp unsigned} semantics.
          */
         protected abstract boolean addCanOverflow(IntegerStamp a, IntegerStamp b);
 
         /**
          * Return {@code true} if the {@code a << shift} can overflow w.r.t.
-         * {@linkplain org.graalvm.compiler.nodes.calc.IntegerLessThanNode.LessThanOp signed} or
-         * {@linkplain org.graalvm.compiler.nodes.calc.IntegerBelowNode.BelowOp unsigned} semantics.
+         * {@linkplain IntegerLessThanNode.LessThanOp signed} or
+         * {@linkplain IntegerBelowNode.BelowOp unsigned} semantics.
          */
         protected abstract boolean leftShiftCanOverflow(IntegerStamp a, long shift);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerMulHighNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerMulHighNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
index 3a488389db89..6c7015c91e34 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerMulHighNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.MulHigh;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerNormalizeCompareNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerNormalizeCompareNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
index 67692e23f69c..c6bcca088e63 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerNormalizeCompareNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
index 8f786042a926..7f0ed6fd6f1a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IntegerTestNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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.vm.ci.meta.TriState;
 
@@ -47,7 +47,7 @@
  * both x and y.
  */
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
-public final class IntegerTestNode extends BinaryOpLogicNode implements BinaryCommutative {
+public final class IntegerTestNode extends BinaryOpLogicNode implements Canonicalizable.BinaryCommutative {
     public static final NodeClass TYPE = NodeClass.create(IntegerTestNode.class);
 
     public IntegerTestNode(ValueNode x, ValueNode y) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IsNullNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IsNullNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
index bc4ceeef3265..54dcca970844 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/IsNullNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CompressionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnaryOpLogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
-import org.graalvm.compiler.nodes.type.StampTool;
+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;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
index 7206020ac6d2..24c54a0a4633 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/LeftShiftNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
@@ -22,23 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shl;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
@@ -50,7 +48,7 @@ public final class LeftShiftNode extends ShiftNode {
     public static final NodeClass TYPE = NodeClass.create(LeftShiftNode.class);
 
     public LeftShiftNode(ValueNode x, ValueNode y) {
-        super(TYPE, getArithmeticOpTable(x).getShl(), x, y);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(x).getShl(), x, y);
     }
 
     public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MaxNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MaxNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MaxNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MaxNode.java
index ec25d5c268d8..b145207460c4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MaxNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MaxNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.NumUtil.Signedness;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Max;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
+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;
 
 @NodeInfo(shortName = "Max")
 public class MaxNode extends MinMaxNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MinMaxNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MinMaxNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
index 0cefaa924528..205e963970cc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MinMaxNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
@@ -24,27 +24,27 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.NumUtil.Signedness;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
@@ -78,7 +78,7 @@ public ValueNode canonical(CanonicalizerTool tool, ValueNode forX, ValueNode for
                 return result;
             }
         }
-        return reassociateMatchedValues(this, ValueNode.isConstantPredicate(), forX, forY, view);
+        return reassociateMatchedValues(this, isConstantPredicate(), forX, forY, view);
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MinNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MinNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinNode.java
index dd71a2083413..28f252ebd58d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MinNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.NumUtil.Signedness;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Min;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
+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;
 
 @NodeInfo(shortName = "Min")
 public class MinNode extends MinMaxNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MulNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MulNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MulNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MulNode.java
index e1b6fc931951..c6c0092292c7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/MulNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MulNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Mul;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
@@ -47,7 +47,7 @@
 import jdk.vm.ci.meta.Value;
 
 @NodeInfo(shortName = "*", cycles = CYCLES_2)
-public class MulNode extends BinaryArithmeticNode implements NarrowableArithmeticNode, BinaryCommutative {
+public class MulNode extends BinaryArithmeticNode implements NarrowableArithmeticNode, Canonicalizable.BinaryCommutative {
 
     public static final NodeClass TYPE = NodeClass.create(MulNode.class);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NarrowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NarrowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
index f325b713a440..d144d7d0a01f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NarrowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
@@ -22,27 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 
@@ -60,7 +59,7 @@ public NarrowNode(ValueNode input, int resultBits) {
     }
 
     public NarrowNode(ValueNode input, int inputBits, int resultBits) {
-        super(TYPE, getArithmeticOpTable(input).getNarrow(), inputBits, resultBits, input);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(input).getNarrow(), inputBits, resultBits, input);
     }
 
     public static ValueNode create(ValueNode input, int resultBits, NodeView view) {
@@ -156,7 +155,7 @@ public ValueNode canonical(CanonicalizerTool tool, ValueNode forValue) {
             // SignExtendNode or ZeroExtendNode
             IntegerConvertNode other = (IntegerConvertNode) forValue;
             if (tool.allUsagesAvailable()) {
-                if ((graph() == null || graph().isAfterStage(StageFlag.VALUE_PROXY_REMOVAL)) && other.getValue().hasExactlyOneUsage() && other.hasMoreThanOneUsage()) {
+                if ((graph() == null || graph().isAfterStage(GraphState.StageFlag.VALUE_PROXY_REMOVAL)) && other.getValue().hasExactlyOneUsage() && other.hasMoreThanOneUsage()) {
                     // Do not perform if this will introduce a new live value.
                     // If the original value's usage count is > 1, there is already another user.
                     // If the convert's usage count is <=1, it will be dead code eliminated.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
index 0535e6eaab7f..26e044162407 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NarrowableArithmeticNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.nodes.ArithmeticOperation;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NegateNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NegateNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NegateNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NegateNode.java
index 6ab13b74da21..baf1d03ade99 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NegateNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NegateNode.java
@@ -22,26 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Neg;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.StampInverter;
+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;
 
 /**
  * The {@code NegateNode} node negates its operand.
@@ -56,7 +55,7 @@ public NegateNode(ValueNode value) {
     }
 
     protected NegateNode(NodeClass c, ValueNode value) {
-        super(c, getArithmeticOpTable(value).getNeg(), value);
+        super(c, BinaryArithmeticNode.getArithmeticOpTable(value).getNeg(), value);
     }
 
     public static ValueNode create(ValueNode value, NodeView view) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NotNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NotNode.java
similarity index 72%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NotNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NotNode.java
index 12cca487903e..1aa694607264 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/NotNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NotNode.java
@@ -22,24 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Not;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.StampInverter;
+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;
 
 /**
  * Binary negation of long or integer values.
@@ -50,7 +49,7 @@ public final class NotNode extends UnaryArithmeticNode implements Arithmeti
     public static final NodeClass TYPE = NodeClass.create(NotNode.class);
 
     protected NotNode(ValueNode x) {
-        super(TYPE, getArithmeticOpTable(x).getNot(), x);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(x).getNot(), x);
     }
 
     public static ValueNode create(ValueNode x) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
index de88718476f6..34f5696dfa2a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ObjectEqualsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.GetClassNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualBoxingNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -70,7 +70,7 @@ public ObjectEqualsNode(ValueNode x, ValueNode y) {
     }
 
     public static LogicNode create(ValueNode x, ValueNode y, ConstantReflectionProvider constantReflection, NodeView view) {
-        LogicNode result = CompareNode.tryConstantFold(CanonicalCondition.EQ, x, y, constantReflection, false);
+        LogicNode result = tryConstantFold(CanonicalCondition.EQ, x, y, constantReflection, false);
         if (result != null) {
             return result;
         } else {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/OrNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/OrNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/OrNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/OrNode.java
index f936a1d2f3d3..af4b8372892c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/OrNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/OrNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.Constant;
 
 @NodeInfo(shortName = "|")
-public final class OrNode extends BinaryArithmeticNode implements BinaryCommutative, NarrowableArithmeticNode {
+public final class OrNode extends BinaryArithmeticNode implements Canonicalizable.BinaryCommutative, NarrowableArithmeticNode {
 
     public static final NodeClass TYPE = NodeClass.create(OrNode.class);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
index e834094c6fe3..0591ce9c3332 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/PointerEqualsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.AbstractBoxingNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.LoadMethodNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -55,7 +55,7 @@
 import jdk.vm.ci.meta.TriState;
 
 @NodeInfo(shortName = "==")
-public class PointerEqualsNode extends CompareNode implements BinaryCommutative {
+public class PointerEqualsNode extends CompareNode implements Canonicalizable.BinaryCommutative {
 
     public static final NodeClass TYPE = NodeClass.create(PointerEqualsNode.class);
     private static final PointerEqualsOp OP = new PointerEqualsOp();
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
index 02a330d4e83e..91af3be6a9dc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ReinterpretNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
@@ -22,30 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.calc.ReinterpretUtils;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ReinterpretOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticStamp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ArithmeticOperation;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
@@ -136,6 +135,6 @@ public ReinterpretOp getArithmeticOp() {
     }
 
     private static ReinterpretOp getOp(ValueNode forValue) {
-        return getArithmeticOpTable(forValue).getReinterpret();
+        return BinaryArithmeticNode.getArithmeticOpTable(forValue).getReinterpret();
     }
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RemNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RemNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RemNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RemNode.java
index 07f123a632fb..afd3412b9207 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RemNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RemNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Rem;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(shortName = "%", cycles = CYCLES_32/* div */)
 public class RemNode extends BinaryArithmeticNode implements Lowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
index 8e3f630dae1b..4da105296e9c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RightShiftNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
@@ -22,23 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp.Shr;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 
@@ -48,7 +46,7 @@ public final class RightShiftNode extends ShiftNode {
     public static final NodeClass TYPE = NodeClass.create(RightShiftNode.class);
 
     public RightShiftNode(ValueNode x, ValueNode y) {
-        super(TYPE, getArithmeticOpTable(x).getShr(), x, y);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(x).getShr(), x, y);
     }
 
     public static ValueNode create(ValueNode x, int y, NodeView view) {
@@ -61,7 +59,7 @@ public static ValueNode create(ValueNode x, int y, NodeView view) {
     public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
         ArithmeticOpTable.ShiftOp op = ArithmeticOpTable.forStamp(x.stamp(view)).getShr();
         Stamp stamp = op.foldStamp(x.stamp(view), (IntegerStamp) y.stamp(view));
-        ValueNode value = ShiftNode.canonical(op, stamp, x, y, view);
+        ValueNode value = canonical(op, stamp, x, y, view);
         if (value != null) {
             return value;
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RoundFloatToIntegerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RoundFloatToIntegerNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
index bd5cca7f39af..aab7a72e6640 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RoundFloatToIntegerNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
 
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RoundNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RoundNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundNode.java
index 1227d238339c..369bf5da0c28 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/RoundNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundNode.java
@@ -23,24 +23,24 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ShiftNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ShiftNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
index 5b8d41f83f38..b5b46e377800 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ShiftNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
@@ -22,27 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Set;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ArithmeticOperation;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
@@ -70,7 +69,7 @@ protected ShiftNode(NodeClass> c, ShiftOp opForStamp
     protected abstract ShiftOp getOp(ArithmeticOpTable table);
 
     protected final ShiftOp getOp(ValueNode forValue) {
-        return getOp(getArithmeticOpTable(forValue));
+        return getOp(BinaryArithmeticNode.getArithmeticOpTable(forValue));
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
index 3c006ec01eed..96a7250a80ea 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignExtendNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
@@ -22,25 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.SignExtend;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 
@@ -62,7 +61,7 @@ public SignExtendNode(ValueNode input, int resultBits) {
     }
 
     public SignExtendNode(ValueNode input, int inputBits, int resultBits) {
-        super(TYPE, getArithmeticOpTable(input).getSignExtend(), inputBits, resultBits, input);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(input).getSignExtend(), inputBits, resultBits, input);
     }
 
     public static ValueNode create(ValueNode input, int resultBits, NodeView view) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
index 7360b56e8794..0d260a0694e3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedDivNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 
@@ -117,7 +117,7 @@ public static ValueNode canonical(SignedDivNode self, ValueNode forX, ValueNode
             }
         }
 
-        if (self != null && self.canFloat() && GraalOptions.FloatingDivNodes.getValue(self.getOptions()) && self.graph().isBeforeStage(StageFlag.VALUE_PROXY_REMOVAL)) {
+        if (self != null && self.canFloat() && GraalOptions.FloatingDivNodes.getValue(self.getOptions()) && self.graph().isBeforeStage(GraphState.StageFlag.VALUE_PROXY_REMOVAL)) {
             IntegerStamp yStamp = (IntegerStamp) forY.stamp(view);
             if (!yStamp.contains(0) && divisionIsJVMSCompliant(forX, forY, divisionOverflowIsJVMSCompliant)) {
                 return SignedFloatingIntegerDivNode.create(forX, forY, view, zeroCheck, divisionOverflowIsJVMSCompliant);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedFloatingIntegerDivNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedFloatingIntegerDivNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
index bd1bdf599b55..6ec401148177 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedFloatingIntegerDivNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Div;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_32, size = SIZE_1, shortName = "/")
 public class SignedFloatingIntegerDivNode extends FloatingIntegerDivRemNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedFloatingIntegerRemNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedFloatingIntegerRemNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
index acb85362bacb..80148cdc2e4d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedFloatingIntegerRemNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
@@ -23,26 +23,26 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Rem;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_32, size = SIZE_1, shortName = "%")
 public class SignedFloatingIntegerRemNode extends FloatingIntegerDivRemNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
index 3085329a62d8..263f8747eff5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignedRemNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
@@ -111,7 +111,7 @@ private static ValueNode canonical(SignedRemNode self, ValueNode forX, ValueNode
                 return null;
             }
         }
-        if (tool != null && self.canFloat() && GraalOptions.FloatingDivNodes.getValue(tool.getOptions()) && self.graph().isBeforeStage(StageFlag.VALUE_PROXY_REMOVAL)) {
+        if (tool != null && self.canFloat() && GraalOptions.FloatingDivNodes.getValue(tool.getOptions()) && self.graph().isBeforeStage(GraphState.StageFlag.VALUE_PROXY_REMOVAL)) {
             IntegerStamp yStamp = (IntegerStamp) forY.stamp(view);
             if (!yStamp.contains(0) && SignedDivNode.divisionIsJVMSCompliant(forX, forY, divisionOverflowIsJVMSCompliant)) {
                 return SignedFloatingIntegerRemNode.create(forX, forY, view, zeroCheck, divisionOverflowIsJVMSCompliant);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignumNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignumNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignumNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignumNode.java
index 91b04d1b5500..0b17f27b2d74 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SignumNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignumNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SqrtNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
similarity index 69%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SqrtNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
index f60b42685c46..3ba97c1cd8dd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SqrtNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
@@ -22,23 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_16;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_16;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp.Sqrt;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Square root.
@@ -49,7 +48,7 @@ public final class SqrtNode extends UnaryArithmeticNode implements Arithme
     public static final NodeClass TYPE = NodeClass.create(SqrtNode.class);
 
     protected SqrtNode(ValueNode x) {
-        super(TYPE, getArithmeticOpTable(x).getSqrt(), x);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(x).getSqrt(), x);
     }
 
     public static ValueNode create(ValueNode x, NodeView view) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SubNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SubNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SubNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SubNode.java
index 63053733cffe..de83253bb22a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/SubNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SubNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Sub;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/TernaryNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/TernaryNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
index a394cc23c606..ff2a60e40332 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/TernaryNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
@@ -22,14 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * The {@code TernaryNode} class is the base of arithmetic and logic operations with three inputs.
@@ -38,9 +39,9 @@
 public abstract class TernaryNode extends FloatingNode implements Canonicalizable.Ternary {
 
     public static final NodeClass TYPE = NodeClass.create(TernaryNode.class);
-    @Input protected ValueNode x;
-    @Input protected ValueNode y;
-    @Input protected ValueNode z;
+    @Node.Input protected ValueNode x;
+    @Node.Input protected ValueNode y;
+    @Node.Input protected ValueNode z;
 
     @Override
     public ValueNode getX() {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
index 560a02126b25..78614f96d9ae 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnaryArithmeticNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
@@ -22,27 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+package jdk.compiler.graal.nodes.calc;
 
 import java.util.Set;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ArithmeticOperation;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 @NodeInfo
 public abstract class UnaryArithmeticNode extends UnaryNode implements ArithmeticOperation, ArithmeticLIRLowerable {
@@ -56,7 +54,7 @@ protected UnaryArithmeticNode(NodeClass> c, Un
     protected abstract UnaryOp getOp(ArithmeticOpTable table);
 
     protected final UnaryOp getOp(ValueNode forValue) {
-        return getOp(getArithmeticOpTable(forValue));
+        return getOp(BinaryArithmeticNode.getArithmeticOpTable(forValue));
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnaryNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnaryNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
index e5c4042f2c3f..d4d65039a6e9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnaryNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * The {@code UnaryNode} class is the base of arithmetic and bit logic operations with exactly one
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
index 89faf52dbdc7..13cfa61d05ea 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnpackEndianHalfNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
 import java.nio.ByteOrder;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
index 1786cd3ab9eb..fc3a31ba29ae 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedDivNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedMaxNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedMaxNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
index 8ed96b9efcc1..d96c84a6f753 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedMaxNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.NumUtil.Signedness;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMax;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
+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;
 
 @NodeInfo(shortName = "UnsignedMax")
 public class UnsignedMaxNode extends MinMaxNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedMinNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedMinNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
index 201ea582f06a..bb0acd18d4a7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedMinNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
@@ -23,20 +23,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.NumUtil.Signedness;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMin;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
+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;
 
 @NodeInfo(shortName = "UnsignedMin")
 public class UnsignedMinNode extends MinMaxNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
index 3460cfe3d74d..8539e75f7c5d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedRemNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
+package jdk.compiler.graal.nodes.calc;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
index 4f3c1ce724b8..3ab469a9c867 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/UnsignedRightShiftNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
@@ -22,23 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.ShiftOp.UShr;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
@@ -49,7 +47,7 @@ public final class UnsignedRightShiftNode extends ShiftNode {
     public static final NodeClass TYPE = NodeClass.create(UnsignedRightShiftNode.class);
 
     public UnsignedRightShiftNode(ValueNode x, ValueNode y) {
-        super(TYPE, getArithmeticOpTable(x).getUShr(), x, y);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(x).getUShr(), x, y);
     }
 
     public static ValueNode create(ValueNode x, ValueNode y, NodeView view) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/XorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/XorNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/XorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/XorNode.java
index 27d125edf0e5..8535d63a1447 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/XorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/XorNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Xor;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
 
 @NodeInfo(shortName = "^")
-public final class XorNode extends BinaryArithmeticNode implements BinaryCommutative, NarrowableArithmeticNode {
+public final class XorNode extends BinaryArithmeticNode implements Canonicalizable.BinaryCommutative, NarrowableArithmeticNode {
 
     public static final NodeClass TYPE = NodeClass.create(XorNode.class);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
index 9e903c274f98..ee044a2eacbc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/calc/ZeroExtendNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
@@ -22,26 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.calc;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
-
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.Narrow;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.IntegerConvertOp.ZeroExtend;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 
@@ -65,7 +64,7 @@ public ZeroExtendNode(ValueNode input, int resultBits) {
     }
 
     public ZeroExtendNode(ValueNode input, int inputBits, int resultBits, boolean inputAlwaysPositive) {
-        super(TYPE, getArithmeticOpTable(input).getZeroExtend(), inputBits, resultBits, input);
+        super(TYPE, BinaryArithmeticNode.getArithmeticOpTable(input).getZeroExtend(), inputBits, resultBits, input);
         this.inputAlwaysPositive = inputAlwaysPositive;
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
index b69441c27724..4a016d128898 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/ControlFlowGraph.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.cfg;
+package jdk.compiler.graal.nodes.cfg;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -30,41 +30,39 @@
 import java.util.function.Function;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BasicBlockSet;
-import org.graalvm.compiler.core.common.cfg.CFGVerifier;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.MemUseTrackerKey;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.ProfileData.LoopFrequencyData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock.ModifiableBlock;
-import org.graalvm.compiler.nodes.cfg.HIRBlock.UnmodifiableBlock;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+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;
 
 public final class ControlFlowGraph implements AbstractControlFlowGraph {
 
@@ -184,7 +182,7 @@ private void identifyBlocks(boolean makeEditable) {
         int numBlocks = 0;
         for (AbstractBeginNode begin : graph.getNodes(AbstractBeginNode.TYPE)) {
             GraalError.guarantee(begin.predecessor() != null || (begin instanceof StartNode || begin instanceof AbstractMergeNode), "Disconnected control flow %s encountered", begin);
-            HIRBlock block = makeEditable ? new ModifiableBlock(begin, this) : new UnmodifiableBlock(begin, this);
+            HIRBlock block = makeEditable ? new HIRBlock.ModifiableBlock(begin, this) : new HIRBlock.UnmodifiableBlock(begin, this);
             identifyBlock(block);
             numBlocks++;
             if (numBlocks > AbstractControlFlowGraph.LAST_VALID_BLOCK_INDEX) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/HIRBlock.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/HIRBlock.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
index b8fb23a067bd..f5dc3c11e11a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/HIRBlock.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.cfg;
+package jdk.compiler.graal.nodes.cfg;
 
-import static org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID;
+import static jdk.compiler.graal.core.common.cfg.AbstractControlFlowGraph.INVALID_BLOCK_ID;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
index 95b2a46070a1..3fc997601c7e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/HIRLoop.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.cfg;
+package jdk.compiler.graal.nodes.cfg;
 
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.nodes.LoopBeginNode;
+import jdk.compiler.graal.core.common.cfg.Loop;
+import jdk.compiler.graal.nodes.LoopBeginNode;
 import org.graalvm.word.LocationIdentity;
 
 public final class HIRLoop extends Loop {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/LocationSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/LocationSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
index e5f418e307df..8b51bce779d6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/LocationSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.cfg;
+package jdk.compiler.graal.nodes.cfg;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
index 35df4c88a0b7..8c272dc96f9e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/cfg/ReversePostOrder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.cfg;
+package jdk.compiler.graal.nodes.cfg;
 
 import java.util.List;
 
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.LinkedStack;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
+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;
 
 /**
  * Utility class computing a reverse post order of the {@link ControlFlowGraph}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
index e840a374dbc1..e19b29fb8b46 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/BindToRegisterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class BindToRegisterNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
index 69bb36272f2b..ea7469d2fe7f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/BlackholeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.ReachabilityFenceNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Ensures that the provided values remains alive in the high-level IR and LIR until after register
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
index b15760c7dfbf..9eddbaf25a5c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class ControlFlowAnchorNode extends FixedWithNextNode implements LIRLowerable, ControlFlowAnchored {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
index 6a4bf31c8133..c4a37548c9f7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/ControlFlowAnchored.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
+import jdk.compiler.graal.graph.spi.NodeWithIdentity;
 
 /**
  * Marker interface for nodes that prevents control flow optimizations. The node should never be
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
index d0d62bfa3911..bd6bce9b404a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/DynamicCounterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * 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.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/NeverStripMineNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/NeverStripMineNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
index 38ffabe1ee2e..4d14a2203b7b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/NeverStripMineNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Compiler directives node that disabled strip mining of enclosing loops.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/NeverWriteSinkNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/NeverWriteSinkNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
index a19916bf3170..0901db1188bb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/NeverWriteSinkNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Compiler directives node that disables write sinking of all enclosing loops.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
index 5177b8d09873..569ccb37ad57 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/SideEffectNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
@@ -22,20 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 /**
@@ -46,7 +47,7 @@
 public class SideEffectNode extends AbstractMemoryCheckpoint implements LIRLowerable, SingleMemoryKill {
     public static final NodeClass TYPE = NodeClass.create(SideEffectNode.class);
 
-    @OptionalInput ValueNode value;
+    @Node.OptionalInput ValueNode value;
 
     public SideEffectNode() {
         super(TYPE, StampFactory.forVoid());
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
index d74e5e4056e6..56d1bb1331f2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/SpillRegistersNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_0)
 public final class SpillRegistersNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
index fb096229f3fb..42c829d7ad0b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/StringToBytesNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
index d108d7e7ca9a..5499f8cde57f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/debug/VerifyHeapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.debug;
+package jdk.compiler.graal.nodes.debug;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 /**
  * A node for platform dependent verification of the Java heap. Intended to be used for debugging
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/AbstractBoxingNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/AbstractBoxingNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
index 2961de3a8167..c40ce211c10c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/AbstractBoxingNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
index c8e34d913c63..f2ffdf6e909a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/AnchoringNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 
 public interface AnchoringNode extends ValueNodeInterface {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
index 8f99a52dd0a3..e06424254676 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ArrayRangeWrite.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FixedWithNextNodeInterface;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 public interface ArrayRangeWrite extends FixedWithNextNodeInterface {
     AddressNode getAddress();
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BoxNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BoxNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BoxNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BoxNode.java
index 0eb903a76e45..183ad86a056c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BoxNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BoxNode.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
 import java.util.Collections;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualBoxingNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
index 72be24f12b9a..983fefdc686e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BranchProbabilityNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
@@ -22,42 +22,42 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodePredicates;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.ShortCircuitOrNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
index afff818960c6..94246d862f34 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/BytecodeExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.Value;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CacheWritebackNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CacheWritebackNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
index 8900f01f50c8..885abfbd2756 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CacheWritebackNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CacheWritebackSyncNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CacheWritebackSyncNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
index e556b91e0466..d45ba4e5d1a8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CacheWritebackSyncNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Implements {@code jdk.internal.misc.Unsafe.writebackPreSync0(long)} and
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CaptureStateBeginNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CaptureStateBeginNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
index 6d6c40ac2cda..7512bfc17f8e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/CaptureStateBeginNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.iterators.NodePredicates;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.BeginStateSplitNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MemoryProxyNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 /**
  * An {@linkplain AbstractBeginNode begin node} that can capture the state at a certain program
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ClassIsArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ClassIsArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
index 0b2209096f3d..e6e9e661c091 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ClassIsArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
index 988961934620..8ba1940898d5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/FixedValueAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ForeignCall.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ForeignCall.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
index c921f89db961..ba518fd08390 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ForeignCall.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.DeoptBciSupplier;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
index c78be0e0578a..b9dac80a3e47 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ForeignCallNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GetClassNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GetClassNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
index 77d10191fd44..877cdd863426 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GetClassNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
index 7865f846a718..421f0e88d07f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 
 /**
  * A node that may be guarded by a {@linkplain GuardingNode guarding node}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
index 9c41c3cecd03..dc6dc62622c4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardedUnsafeLoadNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
+import static jdk.compiler.graal.nodeinfo.InputType.Guard;
 
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardingNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardingNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
index 62e9868d1008..6ac4dbad6dfb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/GuardingNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 
 public interface GuardingNode extends ValueNodeInterface {
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/HubGetClassNodeInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/HubGetClassNodeInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
index ced810c4ff22..5376df833923 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/HubGetClassNodeInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
index 1989bc8479fc..42ee7ecd77b9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/IntegerSwitchNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.SwitchFoldable;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
index 412256782820..f879f9871610 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/JavaReadNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
index 36e478e8ab44..7ff7b78c2ccf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/JavaWriteNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractWriteNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
index 097a59ca8e1b..169876ec2b04 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadArrayComponentHubNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.StampProvider;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
index d45628666477..aa2402677daa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadHubNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
index a2e14eb78756..3ecba8a0b116 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadHubOrNullNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
index c3889a032327..1b0dc9fc395f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/LoadMethodNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MembarNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MembarNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MembarNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MembarNode.java
index 3bae6bf2b9d6..fa593f23924d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MembarNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MembarNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 java.util.Map;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.MemoryBarriers;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
index 9c809a2861ec..ba90d5c42cc2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MonitorEnter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
 /**
  * Denotes monitor locking transition.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MonitorExit.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MonitorExit.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
index e57965998998..bb2263d5d635 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MonitorExit.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+import jdk.compiler.graal.nodes.memory.SingleMemoryKill;
 
 /**
  * Denotes monitor unlocking transition.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MultiGuardNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MultiGuardNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
index 8ba4d853b66e..d0f1e684e5a3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/MultiGuardNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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 java.util.ArrayList;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
index 50eb23e827f8..931f4759b20d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/NullCheckNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CompressionNode;
-import org.graalvm.compiler.nodes.ImplicitNullCheckNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
index 1bc3f013f892..371810a4b129 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRLocalNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractLocalNode;
+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;
 
 @NodeInfo(nameTemplate = "OSRLocal({p#index})")
 public final class OSRLocalNode extends AbstractLocalNode implements IterableNodeType {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
index b8b192170446..f29a9b91c794 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRLockNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractLocalNode;
+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;
 
 @NodeInfo(nameTemplate = "OSRLock({p#index})")
 public class OSRLockNode extends AbstractLocalNode implements IterableNodeType {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
index 62f1761f4a60..0eef8b73348e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRMonitorEnterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public class OSRMonitorEnterNode extends MonitorEnterNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
index 0fe43abb8bb9..ac3ca4d3cf7a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OSRStartNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 @NodeInfo
 public final class OSRStartNode extends StartNode implements Lowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ObjectIsArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ObjectIsArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
index cff17458e7b9..4ac4e63a14f4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ObjectIsArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.UnaryOpLogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.ResolvedJavaType;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueGuardNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueGuardNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
index 553ef2656622..67c816711537 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueGuardNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
+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 static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueLogicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueLogicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
index 50b75598ba2d..ed93f6b79951 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueLogicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LIRLowerableLogicNode;
-import org.graalvm.compiler.nodes.LogicNode;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0, allowedUsageTypes = {InputType.Condition})
 public final class OpaqueLogicNode extends LIRLowerableLogicNode implements NodeWithIdentity {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
index f46f7e8cfd23..95b3b5904434 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public abstract class OpaqueNode extends FloatingNode implements NodeWithIdentity {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueValueNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueValueNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
index b5b05ef6cc63..48de42a9b317 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/OpaqueValueNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
index 4d12f518168c..e3eb4389c2cd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/RawLoadNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -81,7 +81,7 @@ public RawLoadNode(ValueNode object, ValueNode offset, JavaKind accessKind, Loca
 
     /**
      * This constructor exists for node intrinsics that need a stamp based on the return type of the
-     * {@link org.graalvm.compiler.graph.Node.NodeIntrinsic} annotated method.
+     * {@link Node.NodeIntrinsic} annotated method.
      */
     public RawLoadNode(@InjectedNodeParameter Stamp stamp, ValueNode object, ValueNode offset, LocationIdentity locationIdentity, JavaKind accessKind) {
         super(TYPE, stamp, object, offset, accessKind, locationIdentity, false, MemoryOrderMode.PLAIN);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
index db364dbd20c3..d85b62cede20 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/RawStoreNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
-
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
index 493c0badfd23..7dc3b89d00bb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/StateSplitProxyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * This node provides a state split along with the functionality of {@link FixedValueAnchorNode}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
index 2ea04a668738..5b267ae1398e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/StoreHubNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_1)
 public final class StoreHubNode extends AbstractStateSplit implements Lowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/SwitchCaseProbabilityNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/SwitchCaseProbabilityNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
index ab037bdd6e05..1c68b8ba2914 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/SwitchCaseProbabilityNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/SwitchNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/SwitchNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
index dcdca26442b1..f2ceff9dc1a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/SwitchNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
@@ -22,37 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+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 java.util.Arrays;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSuccessorList;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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.vm.ci.meta.Constant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnboxNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnboxNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
index be47fd503a70..b7cad9196202 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnboxNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
index 096eb50ad768..2c340db1396b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeAccessNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 import java.nio.ByteOrder;
 
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
index 851a421d41be..ad0d7a2093a5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeCopyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
index 8e740430d38c..d670689e2a96 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryLoadNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
index 198bf3412710..a723119d516b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/UnsafeMemoryStoreNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
index adfa7e248403..9df47eebabe7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/extended/ValueAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.extended;
+package jdk.compiler.graal.nodes.extended;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Anchor;
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 /**
  * This node can be used for two different kinds of anchoring for non-CFG (floating) nodes: It can
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ArrayRangeWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ArrayRangeWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
index b8df73b21756..0ef1c9a26c45 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ArrayRangeWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/BarrierSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/BarrierSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
index 0f7cc1e26566..20c44217508f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/BarrierSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
@@ -23,14 +23,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
index 3908289d6c73..0738b6352cad 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/CardTableBarrierSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
@@ -23,27 +23,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ArrayRangePostWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ArrayRangePostWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
index ff848c0c227a..db95e4698de3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ArrayRangePostWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public class G1ArrayRangePostWriteBarrier extends ArrayRangeWriteBarrier {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ArrayRangePreWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ArrayRangePreWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
index f280ec5a3629..073db7146e78 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ArrayRangePreWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
@@ -23,15 +23,15 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public final class G1ArrayRangePreWriteBarrier extends ArrayRangeWriteBarrier {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
index 2713238468a6..5d49baabef7e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1BarrierSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
@@ -23,24 +23,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
-
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ArrayRangeWrite;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.type.StampTool;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1PostWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1PostWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
index 7c077793fd1b..89943d78c8f8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1PostWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public class G1PostWriteBarrier extends ObjectWriteBarrier {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1PreWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1PreWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
index b4a94d8063e2..63e7870334bf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1PreWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
@@ -23,18 +23,18 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 @NodeInfo(cycles = CYCLES_64, size = SIZE_64)
 public final class G1PreWriteBarrier extends ObjectWriteBarrier implements DeoptimizingNode.DeoptBefore {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ReferentFieldReadBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ReferentFieldReadBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
index 7c7fdd3cd749..b222aae9235b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/G1ReferentFieldReadBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 /**
  * The {@code G1ReferentFieldReadBarrier} is added when a read access is performed to the referent
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ObjectWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ObjectWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
index 3e8384477912..e1d99b56c712 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ObjectWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 @NodeInfo
 public abstract class ObjectWriteBarrier extends WriteBarrier {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/SerialArrayRangeWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/SerialArrayRangeWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
index 9c9db2de2db0..c7581764baef 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/SerialArrayRangeWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_8)
 public final class SerialArrayRangeWriteBarrier extends ArrayRangeWriteBarrier {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/SerialWriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/SerialWriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
index 37a9f9c820ed..2f7c8343a5d9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/SerialWriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
+package jdk.compiler.graal.nodes.gc;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.compiler.graal.nodes.memory.address.AddressNode;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_4)
 public class SerialWriteBarrier extends ObjectWriteBarrier {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/WriteBarrier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/WriteBarrier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
index 7a05aa2577b6..4f38a7d12b2b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/WriteBarrier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 @NodeInfo
 public abstract class WriteBarrier extends FixedWithNextNode implements Lowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ZBarrierSet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ZBarrierSet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
index 7e536a05641d..dabb6240cf41 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/gc/ZBarrierSet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.gc;
-
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
-
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.memory.AddressableMemoryAccess;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.LIRLowerableAccess;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
index 289dc13e74eb..38522a619fc6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ClassInitializationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import java.util.function.Supplier;
 
-import org.graalvm.compiler.nodes.FrameState;
+import jdk.compiler.graal.nodes.FrameState;
 
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
index 8c1116bfd509..699890bd79c8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ForeignCallPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.nodes.extended.ForeignCallNode;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
index ebcef23f6f9d..c57cf5591eb6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import java.lang.reflect.Type;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
index 909ba89e24a0..92ade245c47b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.PluginReplacementNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
+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.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
index 34db9dd41e05..c1434517c647 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import java.lang.reflect.Type;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedPluginFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedPluginFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
index 60653f965791..98fa4e3c3fcc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedPluginFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 public interface GeneratedPluginFactory {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
index b5e7dde9b12e..cb04a291abde 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.core.common.type.Stamp;
+import jdk.compiler.graal.core.common.type.Stamp;
 
 public interface GeneratedPluginInjectionProvider {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
index 35e67fbfac8f..62b6591018c0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.type.StampPair;
+import jdk.compiler.graal.core.common.type.StampPair;
 
 import jdk.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
index 8dffdcf0caa7..6ad0a7069493 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
@@ -22,54 +22,55 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
-import static org.graalvm.compiler.core.common.GraalOptions.StrictDeoptInsertionChecks;
-import static org.graalvm.compiler.core.common.type.StampFactory.objectNonNull;
-
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DynamicPiNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invokable;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.PluginReplacementNode;
-import org.graalvm.compiler.nodes.PluginReplacementWithExceptionNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 jdk.vm.ci.code.BailoutException;
 import jdk.vm.ci.meta.Assumptions;
@@ -325,7 +326,7 @@ default ValueNode nullCheckedValue(ValueNode value) {
     default GuardingNode intrinsicRangeCheck(LogicNode condition, boolean negated) {
         assert isParsingInvocationPlugin();
         if (needsExplicitException()) {
-            return emitBytecodeExceptionCheck(condition, negated, BytecodeExceptionKind.INTRINSIC_OUT_OF_BOUNDS);
+            return emitBytecodeExceptionCheck(condition, negated, BytecodeExceptionNode.BytecodeExceptionKind.INTRINSIC_OUT_OF_BOUNDS);
         } else {
             return add(new FixedGuardNode(condition, DeoptimizationReason.BoundsCheckException, DeoptimizationAction.None, !negated));
         }
@@ -340,7 +341,7 @@ default ValueNode nullCheckedValue(ValueNode value, DeoptimizationAction action)
             LogicNode condition = getGraph().unique(IsNullNode.create(value));
             GuardingNode guardingNode;
             if (needsExplicitException()) {
-                guardingNode = emitBytecodeExceptionCheck(condition, false, BytecodeExceptionKind.NULL_POINTER);
+                guardingNode = emitBytecodeExceptionCheck(condition, false, BytecodeExceptionNode.BytecodeExceptionKind.NULL_POINTER);
             } else {
                 guardingNode = append(new FixedGuardNode(condition, DeoptimizationReason.NullCheckException, action, true));
             }
@@ -353,7 +354,7 @@ default ValueNode nullCheckedValue(ValueNode value, DeoptimizationAction action)
      * When {@link #needsExplicitException} is true, the method returns a node with a stamp that is
      * always positive and emits code that throws the provided exceptionKind for a negative length.
      */
-    default ValueNode maybeEmitExplicitNegativeArraySizeCheck(ValueNode arrayLength, BytecodeExceptionKind exceptionKind) {
+    default ValueNode maybeEmitExplicitNegativeArraySizeCheck(ValueNode arrayLength, BytecodeExceptionNode.BytecodeExceptionKind exceptionKind) {
         if (!needsExplicitException() || ((IntegerStamp) arrayLength.stamp(NodeView.DEFAULT)).isPositive()) {
             return arrayLength;
         }
@@ -368,7 +369,7 @@ default ValueNode maybeEmitExplicitNegativeArraySizeCheck(ValueNode arrayLength,
     }
 
     default ValueNode maybeEmitExplicitNegativeArraySizeCheck(ValueNode arrayLength) {
-        return maybeEmitExplicitNegativeArraySizeCheck(arrayLength, BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE);
+        return maybeEmitExplicitNegativeArraySizeCheck(arrayLength, BytecodeExceptionNode.BytecodeExceptionKind.NEGATIVE_ARRAY_SIZE);
     }
 
     default GuardingNode maybeEmitExplicitDivisionByZeroCheck(ValueNode divisor) {
@@ -377,10 +378,10 @@ default GuardingNode maybeEmitExplicitDivisionByZeroCheck(ValueNode divisor) {
         }
         ConstantNode zero = add(ConstantNode.defaultForKind(divisor.getStackKind()));
         LogicNode condition = add(IntegerEqualsNode.create(getConstantReflection(), getMetaAccess(), getOptions(), null, divisor, zero, NodeView.DEFAULT));
-        return emitBytecodeExceptionCheck(condition, false, BytecodeExceptionKind.DIVISION_BY_ZERO);
+        return emitBytecodeExceptionCheck(condition, false, BytecodeExceptionNode.BytecodeExceptionKind.DIVISION_BY_ZERO);
     }
 
-    default AbstractBeginNode emitBytecodeExceptionCheck(LogicNode condition, boolean passingOnTrue, BytecodeExceptionKind exceptionKind, ValueNode... arguments) {
+    default AbstractBeginNode emitBytecodeExceptionCheck(LogicNode condition, boolean passingOnTrue, BytecodeExceptionNode.BytecodeExceptionKind exceptionKind, ValueNode... arguments) {
         if (passingOnTrue ? condition.isTautology() : condition.isContradiction()) {
             return null;
         }
@@ -410,7 +411,7 @@ default void genCheckcastDynamic(ValueNode object, ValueNode javaClass) {
             append(condition);
             GuardingNode guardingNode;
             if (needsExplicitException()) {
-                guardingNode = emitBytecodeExceptionCheck(condition, true, BytecodeExceptionKind.CLASS_CAST, object, javaClass);
+                guardingNode = emitBytecodeExceptionCheck(condition, true, BytecodeExceptionNode.BytecodeExceptionKind.CLASS_CAST, object, javaClass);
             } else {
                 guardingNode = add(new FixedGuardNode(condition, DeoptimizationReason.ClassCastException, DeoptimizationAction.InvalidateReprofile, false));
             }
@@ -449,7 +450,7 @@ default FrameState getInvocationPluginBeforeState() {
 
     /**
      * When this returns false, the parser will report an error if an {@link InvocationPlugin}
-     * inserts a {@link org.graalvm.compiler.nodes.DeoptimizeNode} or {@link FixedGuardNode}.
+     * inserts a {@link DeoptimizeNode} or {@link FixedGuardNode}.
      */
     default boolean allowDeoptInPlugins() {
         return !StrictDeoptInsertionChecks.getValue(getOptions());
@@ -512,7 +513,7 @@ default boolean needsExplicitException() {
      * @param exceptionArguments the arguments for the exception.
      * @return a begin node that precedes the actual exception instantiation code.
      */
-    default AbstractBeginNode genExplicitExceptionEdge(BytecodeExceptionKind exceptionKind, ValueNode... exceptionArguments) {
+    default AbstractBeginNode genExplicitExceptionEdge(BytecodeExceptionNode.BytecodeExceptionKind exceptionKind, ValueNode... exceptionArguments) {
         throw GraalError.unimplementedParent(); // ExcludeFromJacocoGeneratedReport
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
index bc53f5868026..5cc18d76f93d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 /**
  * Marker interface for graph builder plugins.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
index d44c77fe1c0a..6bea0d6d6e99 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/GraphBuilderTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.Assumptions;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
index 12e126543414..9b0b9fecb7f0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InlineInvokePlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.bytecode.BytecodeProvider;
+import jdk.compiler.graal.nodes.Invoke;
+import jdk.compiler.graal.nodes.ValueNode;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
index 37d31031bab1..0a00be9d95df 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/IntrinsicContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.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 org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
-
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
+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 jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
index c34a98da7839..6219b08dc1bb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.ClassPlugins;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
index 6702092bed53..b3bd77549b33 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPluginContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.nodes.CallTargetNode;
+import jdk.compiler.graal.nodes.ValueNode;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
index 4bedd0a185f8..acdac8f2a85f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/InvocationPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.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 org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.LateClassPlugins.CLOSED_LATE_CLASS_PLUGIN;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.MetaUtil;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
index c934e4550f2c..e96a75829709 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/LoopExplosionPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
index 5e662c4bd17e..99a02cc194b9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/NodePlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
 import java.util.function.Supplier;
 
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.core.common.BootstrapMethodIntrospection;
-import org.graalvm.compiler.graph.Node.ValueNumberable;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
index cd897735cc42..9b41b1c81d16 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/ParameterPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
+import jdk.compiler.graal.core.common.type.StampPair;
+import jdk.compiler.graal.nodes.calc.FloatingNode;
 
 public interface ParameterPlugin extends GraphBuilderPlugin {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
index fdc26ab26608..3bcbf84af76d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/graphbuilderconf/TypePlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.graphbuilderconf;
+package jdk.compiler.graal.nodes.graphbuilderconf;
 
-import org.graalvm.compiler.core.common.type.StampPair;
+import jdk.compiler.graal.core.common.type.StampPair;
 
 import jdk.vm.ci.meta.JavaType;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
index 4e71e7c03348..c7806dafb39f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractCompareAndSwapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
+import static jdk.compiler.graal.nodeinfo.InputType.Memory;
+import static jdk.compiler.graal.nodeinfo.InputType.State;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.LIRLowerableAccess;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
index 3b0e12cbd6f1..82ff60c066a3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractNewArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
+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.vm.ci.meta.ConstantReflectionProvider;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
index f7cfde97c3a6..cc3781515373 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractNewObjectNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.extended.MembarNode.FenceKind;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 /**
  * The {@code AbstractNewObjectNode} is the base class for the new instance and new array nodes.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
index 1564b718134a..329b77781d0b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AbstractUnsafeCompareAndSwapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.core.common.calc.CanonicalCondition.EQ;
-import static org.graalvm.compiler.debug.DebugContext.DETAILED_LEVEL;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.Value;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
index 898aa0af0ce9..c0066fc670ed 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * This the base class of all array operations.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
index 9a6dfbd18fc5..220dd1fef9ec 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessFieldNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.ResolvedJavaField;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
index 998a4c7bc08f..9ce58d641061 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessIndexedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
index b907b5ee3c10..183070b1f86f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AccessMonitorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+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;
 
 import jdk.vm.ci.code.BailoutException;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
index 9b764f8f15d6..4c1b8a574263 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ArrayLengthNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
index d5c493b23661..72298d94207b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AtomicReadAndAddNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
index 1b4ff29d3100..a8cf86206d4e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/AtomicReadAndWriteNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
index bfcb40546ce0..6502cbc340c1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ClassIsAssignableFromNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.extended.GetClassNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
index c5de8e936b28..3b6633027cf4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/DynamicNewArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
@@ -23,18 +23,18 @@
  * questions.
  */
 //JaCoCo Exclude
-package org.graalvm.compiler.nodes.java;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
index 41a818610820..65a12bbcaf3d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/DynamicNewInstanceNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
 import java.lang.reflect.Modifier;
 
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
index 44a42b54cc33..3ca24223aa75 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ExceptionObjectNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.BeginStateSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.memory.MemoryAnchorNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 {@code org.graalvm.compiler.replacements.SnippetTemplate.replaceExceptionObjectNode}
+     * @see jdk.compiler.graal.replacements.SnippetTemplate#replaceExceptionObjectNode
      */
     private boolean isMarkerAndCanBeRemoved() {
         if (predecessor() instanceof WithExceptionNode) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
index dc0a89645f27..a503f47759e4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/FinalFieldBarrierNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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 org.graalvm.word.LocationIdentity;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_2)
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
index 58b9be6ffaa1..a09ad24a6d47 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ForeignCallDescriptors.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
+import jdk.compiler.graal.core.common.spi.ForeignCallSignature;
 
 /**
  * The foreign call descriptors used by nodes in this package.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
index fc64be3043d7..9c1e6597707c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/InstanceOfDynamicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_32;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
index 8466019b137c..9cfc65cd5867 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/InstanceOfNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Anchor;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+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 java.util.Objects;
 
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.UnaryOpLogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaTypeProfile;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
index bc958dfabff7..32e80a6cd18c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadExceptionObjectNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 @NodeInfo(cycles = CYCLES_8, size = SIZE_8)
 public final class LoadExceptionObjectNode extends AbstractStateSplit implements Lowerable, DeoptimizingNode.DeoptAfter {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
index 33ebe1d6635d..532134630763 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadFieldNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.graph.iterators.NodePredicates.isNotA;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.ConstantFoldUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
index f4b23aa57b1a..34972bbe7aba 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoadIndexedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
index 39ba8300f26e..faa7d12c1e1d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LogicCompareAndSwapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndAddNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndAddNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
index 8c5e8fbc977b..21048229858c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndAddNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.LIRLowerableAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
index 7b781d16dc47..b200b635857a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredAtomicReadAndWriteNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
@@ -22,27 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.LIRLowerableAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredRegisterFinalizerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredRegisterFinalizerNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
index 995a3f47df2f..680f5e5db9c9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/LoweredRegisterFinalizerNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 /**
  * This node is used to perform the finalizer registration at the end of the java.lang.Object
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
index addd7224495e..00514a92c677 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MethodCallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.UncheckedInterfaceProvider;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.Assumptions;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
index aec026da38cf..a3ca5b2410bd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorEnterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.MonitorEnter;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
index 6308a570d855..76a60ada9ca1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorExitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.MonitorExit;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
index f52d5450f129..84b199c092b6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/MonitorIdNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * This node describes one locking scope; it ties the monitor enter, monitor exit and the frame
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
index 6bdb1d064a42..eb4f45be62b1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewArrayInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.nodes.FixedWithNextNodeInterface;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.FixedWithNextNodeInterface;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 
 /**
  * See {@link ValueNodeInterface} for details about these node interfaces.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
index 8b5bc32494b1..73197851bf6d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
 import java.util.Collections;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
index 27dc92c938bd..0504a475e13a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewInstanceNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
 import java.lang.ref.Reference;
 import java.util.Collections;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
+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.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
index c22a9a1f32ff..7e3e5a4a6f50 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/NewMultiArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeList;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ReachabilityFenceNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ReachabilityFenceNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
index aedb1891b8b4..1b61f9fa2c12 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ReachabilityFenceNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
 import java.lang.ref.Reference;
 
+import jdk.compiler.graal.nodes.virtual.VirtualObjectNode;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.iterators.NodePredicates;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CompressionNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
index af7e5d328ee7..ee7429ccfe2d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/RegisterFinalizerNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-import static org.graalvm.compiler.nodes.java.ForeignCallDescriptors.REGISTER_FINALIZER;
+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 org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
index d763c8153481..c24933c07d04 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/StoreFieldNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
index 7379c9993fb5..449a2d53765a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/StoreIndexedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
-
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
index 8d999d47a39d..ed966c7769c1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/TypeSwitchNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndExchangeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
index 1f053565bdbd..5a264b5e39ca 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndExchangeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
index 321442caa7c8..5e9ee5a1160c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/UnsafeCompareAndSwapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ValidateNewInstanceClassNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ValidateNewInstanceClassNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
index 2bdce40b9fab..773ff4344701 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ValidateNewInstanceClassNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
index c8aa197f6d6d..a4c1fc6d3485 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/java/ValueCompareAndSwapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.java;
+package jdk.compiler.graal.nodes.java;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/BasicInductionVariable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/BasicInductionVariable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
index 6459401deb57..0c5dcd84ed24 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/BasicInductionVariable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
@@ -22,26 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
-
-import static org.graalvm.compiler.nodes.loop.MathUtil.add;
-import static org.graalvm.compiler.nodes.loop.MathUtil.mul;
-import static org.graalvm.compiler.nodes.loop.MathUtil.sub;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.util.UnsignedLong;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
+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;
 
 public class BasicInductionVariable extends InductionVariable {
 
@@ -175,7 +171,7 @@ public ValueNode extremumNode(boolean assumeLoopEntered, Stamp stamp, ValueNode
         if (!effectiveTripCount.stamp(NodeView.DEFAULT).isCompatible(stamp)) {
             effectiveTripCount = IntegerConvertNode.convert(effectiveTripCount, stamp, graph(), NodeView.DEFAULT);
         }
-        return add(graph, mul(graph, stride, sub(graph, effectiveTripCount, ConstantNode.forIntegerStamp(stamp, 1, graph))), initNode);
+        return MathUtil.add(graph, MathUtil.mul(graph, stride, MathUtil.sub(graph, effectiveTripCount, ConstantNode.forIntegerStamp(stamp, 1, graph))), initNode);
     }
 
     @Override
@@ -188,7 +184,7 @@ public ValueNode exitValueNode() {
         if (!maxTripCount.stamp(NodeView.DEFAULT).isCompatible(stamp)) {
             maxTripCount = IntegerConvertNode.convert(maxTripCount, stamp, graph(), NodeView.DEFAULT);
         }
-        return add(graph(), mul(graph(), strideNode(), maxTripCount), initNode());
+        return MathUtil.add(graph(), MathUtil.mul(graph(), strideNode(), maxTripCount), initNode());
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
index cde2e12faf66..a1a90c8dbe00 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/CountedLoopInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
@@ -22,41 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
 import static java.lang.Math.abs;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.add;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.sub;
-import static org.graalvm.compiler.nodes.loop.MathUtil.unsignedDivBefore;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.util.UnsignedLong;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.loop.InductionVariable.Direction;
-import org.graalvm.compiler.nodes.util.IntegerHelper;
-import org.graalvm.compiler.nodes.util.SignedIntegerHelper;
-import org.graalvm.compiler.nodes.util.UnsignedIntegerHelper;
+
+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.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
@@ -248,25 +245,25 @@ public ValueNode maxTripCountNode(boolean assumeLoopEntered, IntegerHelper integ
         ValueNode max;
         ValueNode min;
         ValueNode absStride;
-        final Direction direction = getBodyIV().direction();
-        if (direction == Direction.Up) {
+        final InductionVariable.Direction direction = getBodyIV().direction();
+        if (direction == InductionVariable.Direction.Up) {
             absStride = getBodyIV().strideNode();
             max = tripCountLimit;
             min = initNode;
         } else {
-            assert direction == Direction.Down : "direction must be down if its not up - else loop should not be counted " + direction;
+            assert direction == InductionVariable.Direction.Down : "direction must be down if its not up - else loop should not be counted " + direction;
             absStride = NegateNode.create(getBodyIV().strideNode(), NodeView.DEFAULT);
             max = initNode;
             min = tripCountLimit;
         }
-        ValueNode range = sub(max, min);
+        ValueNode range = BinaryArithmeticNode.sub(max, min);
 
         ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1, graph);
         if (isLimitIncluded) {
-            range = add(range, one);
+            range = BinaryArithmeticNode.add(range, one);
         }
         // round-away-from-zero divison: (range + stride -/+ 1) / stride
-        ValueNode denominator = add(graph, range, sub(absStride, one), NodeView.DEFAULT);
+        ValueNode denominator = BinaryArithmeticNode.add(graph, range, BinaryArithmeticNode.sub(absStride, one), NodeView.DEFAULT);
         /*
          * While the divisor can never be zero because that would mean the direction of the loop is
          * not strictly known which disables counted loop detection - it is possible that the stamp
@@ -280,7 +277,7 @@ public ValueNode maxTripCountNode(boolean assumeLoopEntered, IntegerHelper integ
          * refrain from doing so.
          */
         final boolean divisorNonZero = true;
-        ValueNode div = unsignedDivBefore(graph, divisorNonZero, loop.entryPoint(), denominator, absStride, null);
+        ValueNode div = MathUtil.unsignedDivBefore(graph, divisorNonZero, loop.entryPoint(), denominator, absStride, null);
         if (assumeLoopEntered) {
             return graph.addOrUniqueWithInputs(div);
         }
@@ -338,11 +335,11 @@ public boolean loopMightBeEntered() {
 
         ValueNode max;
         ValueNode min;
-        if (getBodyIV().direction() == Direction.Up) {
+        if (getBodyIV().direction() == InductionVariable.Direction.Up) {
             max = getTripCountLimit();
             min = getBodyIV().initNode();
         } else {
-            assert getBodyIV().direction() == Direction.Down;
+            assert getBodyIV().direction() == InductionVariable.Direction.Down;
             max = getBodyIV().initNode();
             min = getTripCountLimit();
         }
@@ -350,7 +347,7 @@ public boolean loopMightBeEntered() {
             // Ensure the constant is value numbered in the graph. Don't add other nodes to the
             // graph, they will be dead code.
             StructuredGraph graph = getBodyIV().valueNode().graph();
-            max = add(max, ConstantNode.forIntegerStamp(stamp, 1, graph), NodeView.DEFAULT);
+            max = BinaryArithmeticNode.add(max, ConstantNode.forIntegerStamp(stamp, 1, graph), NodeView.DEFAULT);
         }
 
         LogicNode entryCheck = getCounterIntegerHelper().createCompareNode(min, max, NodeView.DEFAULT);
@@ -385,14 +382,14 @@ private long rawConstantMaxTripCount() {
         long range;
         long absStride;
         IntegerHelper helper = getCounterIntegerHelper(64);
-        if (getBodyIV().direction() == Direction.Up) {
+        if (getBodyIV().direction() == InductionVariable.Direction.Up) {
             if (helper.compare(endValue, initValue) < 0) {
                 return 0;
             }
             range = endValue - getBodyIV().constantInit();
             absStride = getBodyIV().constantStride();
         } else {
-            assert getBodyIV().direction() == Direction.Down;
+            assert getBodyIV().direction() == InductionVariable.Direction.Down;
             if (helper.compare(initValue, endValue) < 0) {
                 return 0;
             }
@@ -444,7 +441,8 @@ public UnsignedLong constantExactTripCount() {
 
     @Override
     public String toString() {
-        return (isInverted() ? "Inverted " : "") + "iv=" + getLimitCheckedIV() + " until " + getTripCountLimit() + (isLimitIncluded ? getBodyIV().direction() == Direction.Up ? "+1" : "-1" : "") +
+        return (isInverted() ? "Inverted " : "") + "iv=" + getLimitCheckedIV() + " until " + getTripCountLimit() +
+                        (isLimitIncluded ? getBodyIV().direction() == InductionVariable.Direction.Up ? "+1" : "-1" : "") +
                         " bodyIV=" + getBodyIV();
     }
 
@@ -482,7 +480,7 @@ public AbstractBeginNode getCountedExit() {
         }
     }
 
-    public Direction getDirection() {
+    public InductionVariable.Direction getDirection() {
         return getLimitCheckedIV().direction();
     }
 
@@ -556,10 +554,10 @@ public boolean counterNeverOverflows() {
         ValueNode strideNode = getBodyIV().strideNode();
         IntegerStamp strideStamp = (IntegerStamp) strideNode.stamp(NodeView.DEFAULT);
         IntegerHelper integerHelper = getCounterIntegerHelper();
-        if (getDirection() == Direction.Up) {
+        if (getDirection() == InductionVariable.Direction.Up) {
             long max = integerHelper.maxValue();
             return integerHelper.compare(endStamp.upperBound(), max - (strideStamp.upperBound() - 1) - (isLimitIncluded ? 1 : 0)) <= 0;
-        } else if (getDirection() == Direction.Down) {
+        } else if (getDirection() == InductionVariable.Direction.Down) {
             long min = integerHelper.minValue();
             return integerHelper.compare(min + (1 - strideStamp.lowerBound()) + (isLimitIncluded ? 1 : 0), endStamp.lowerBound()) <= 0;
         }
@@ -603,17 +601,17 @@ public LogicNode createOverflowGuardCondition() {
         IntegerHelper integerHelper = getCounterIntegerHelper();
         LogicNode cond; // we use a negated guard with a < condition to achieve a >=
         ConstantNode one = ConstantNode.forIntegerStamp(stamp, 1, graph);
-        if (getBodyIV().direction() == Direction.Up) {
-            ValueNode v1 = sub(ConstantNode.forIntegerStamp(stamp, integerHelper.maxValue()), sub(getBodyIV().strideNode(), one));
+        if (getBodyIV().direction() == InductionVariable.Direction.Up) {
+            ValueNode v1 = BinaryArithmeticNode.sub(ConstantNode.forIntegerStamp(stamp, integerHelper.maxValue()), BinaryArithmeticNode.sub(getBodyIV().strideNode(), one));
             if (isLimitIncluded) {
-                v1 = sub(v1, one);
+                v1 = BinaryArithmeticNode.sub(v1, one);
             }
             cond = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(v1, getTripCountLimit(), NodeView.DEFAULT));
         } else {
-            assert getBodyIV().direction() == Direction.Down;
-            ValueNode v1 = add(ConstantNode.forIntegerStamp(stamp, integerHelper.minValue()), sub(one, getBodyIV().strideNode()));
+            assert getBodyIV().direction() == InductionVariable.Direction.Down;
+            ValueNode v1 = BinaryArithmeticNode.add(ConstantNode.forIntegerStamp(stamp, integerHelper.minValue()), BinaryArithmeticNode.sub(one, getBodyIV().strideNode()));
             if (isLimitIncluded) {
-                v1 = add(v1, one);
+                v1 = BinaryArithmeticNode.add(v1, one);
             }
             cond = graph.addOrUniqueWithInputs(integerHelper.createCompareNode(getTripCountLimit(), v1, NodeView.DEFAULT));
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
index bcd8a36f1465..0ed4698c7291 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DefaultLoopPolicies.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
@@ -22,53 +22,53 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
-
-import static org.graalvm.compiler.core.common.GraalOptions.LoopMaxUnswitch;
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumDesiredSize;
-import static org.graalvm.compiler.core.common.GraalOptions.MinimumPeelFrequency;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.DefaultLoopFrequency;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.DefaultUnswitchFactor;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.ExactFullUnrollMaxNodes;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.ExactPartialUnrollMaxNodes;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.FullUnrollConstantCompareBoost;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.FullUnrollMaxIterations;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.FullUnrollMaxNodes;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyBoost;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyMaxFactor;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchFrequencyMinFactor;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchMaxIncrease;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchMinSplitFrequency;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.LoopUnswitchTrivial;
-import static org.graalvm.compiler.nodes.loop.DefaultLoopPolicies.Options.UnrollMaxIterations;
+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;
 
 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 org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.util.UnsignedLong;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 public class DefaultLoopPolicies implements LoopPolicies {
 
@@ -394,7 +394,7 @@ private static int loopMaxCodeSizeChange(LoopEx loop) {
         StructuredGraph graph = loop.loopBegin().graph();
         OptionValues options = loop.loopBegin().getOptions();
 
-        boolean isTrusted = ProfileSource.isTrusted(loop.localFrequencySource());
+        boolean isTrusted = ProfileData.ProfileSource.isTrusted(loop.localFrequencySource());
         double loopFrequency = isTrusted ? loop.localLoopFrequency() : DefaultLoopFrequency.getValue(options);
         /* When a loop has a greater local loop frequency we allow a bigger change in code size */
         int maxDiff = LoopUnswitchTrivial.getValue(options) + (int) (LoopUnswitchFrequencyBoost.getValue(options) * (loopFrequency - 1.0));
@@ -428,7 +428,7 @@ public UnswitchingDecision shouldUnswitch(LoopEx loop, EconomicMap split : controlSplits.getValues()) {
             boolean isTrusted = true;
             for (ControlSplitNode node : split) {
-                isTrusted = isTrusted && ProfileSource.isTrusted(node.getProfileData().getProfileSource());
+                isTrusted = isTrusted && ProfileData.ProfileSource.isTrusted(node.getProfileData().getProfileSource());
             }
 
             int approxCodeSizeChange = approxCodeSizeChange(loop, split);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
index 7bdc2f0d0d83..3e93e5707ef3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedConvertedInductionVariable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
+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;
 
 public class DerivedConvertedInductionVariable extends DerivedInductionVariable {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
index b84804992c3d..cbc91e8f04f8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedInductionVariable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.core.common.util.CompilationAlarm;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.nodes.ValueNode;
 
 /**
  * Base class of the derived induction variables.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
index 7de30a008bd5..bee82ee718bd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedOffsetInductionVariable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
@@ -22,20 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
-
-import static org.graalvm.compiler.nodes.loop.MathUtil.add;
-import static org.graalvm.compiler.nodes.loop.MathUtil.sub;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
+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;
 
 public class DerivedOffsetInductionVariable extends DerivedInductionVariable {
 
@@ -151,14 +148,14 @@ public ValueNode op(ValueNode b, ValueNode o) {
 
     public ValueNode op(ValueNode b, ValueNode o, boolean gvn) {
         if (value instanceof AddNode) {
-            return add(graph(), b, o, gvn);
+            return MathUtil.add(graph(), b, o, gvn);
         }
         if (value instanceof SubNode) {
             if (base.valueNode() == value.getX()) {
-                return sub(graph(), b, o, gvn);
+                return MathUtil.sub(graph(), b, o, gvn);
             } else {
                 assert base.valueNode() == value.getY();
-                return sub(graph(), o, b, gvn);
+                return MathUtil.sub(graph(), o, b, gvn);
             }
         }
         throw GraalError.shouldNotReachHereUnexpectedValue(value); // ExcludeFromJacocoGeneratedReport
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
index d40266243a42..cbbd853b0311 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/DerivedScaledInductionVariable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
-
-import static org.graalvm.compiler.nodes.loop.MathUtil.mul;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 public class DerivedScaledInductionVariable extends DerivedInductionVariable {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/InductionVariable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/InductionVariable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
index def437872be8..3168894256a2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/InductionVariable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * This class describes a value node that is an induction variable in a counted loop.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/InductionVariableHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/InductionVariableHelper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
index 01f9a7c85684..651723a2c224 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/InductionVariableHelper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
+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;
 
 public class InductionVariableHelper {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopEx.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopEx.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopEx.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopEx.java
index cb495f2c53a4..61dff44269e2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopEx.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopEx.java
@@ -22,63 +22,62 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import static org.graalvm.compiler.phases.common.util.LoopUtility.isNumericInteger;
+import static jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.iterators.NodePredicate;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.debug.NeverStripMineNode;
-import org.graalvm.compiler.nodes.debug.NeverWriteSinkNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.loop.InductionVariable.Direction;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+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;
 
 public class LoopEx {
     protected final Loop loop;
@@ -99,7 +98,7 @@ public double localLoopFrequency() {
         return data.getCFG().localLoopFrequency(loopBegin());
     }
 
-    public ProfileSource localFrequencySource() {
+    public ProfileData.ProfileSource localFrequencySource() {
         return data.getCFG().localLoopFrequencySource(loopBegin());
     }
 
@@ -329,7 +328,7 @@ public boolean detectCounted() {
                     IntegerStamp initStamp = (IntegerStamp) iv.initNode().stamp(NodeView.DEFAULT);
                     IntegerStamp limitStamp = (IntegerStamp) limit.stamp(NodeView.DEFAULT);
                     IntegerStamp counterStamp = (IntegerStamp) iv.valueNode().stamp(NodeView.DEFAULT);
-                    if (iv.direction() == Direction.Up) {
+                    if (iv.direction() == InductionVariable.Direction.Up) {
                         if (limitStamp.asConstant() != null && limitStamp.asConstant().asLong() == counterStamp.upperBound()) {
                             // signed: i < MAX_INT
                         } else if (limitStamp.asConstant() != null && limitStamp.asConstant().asLong() == counterStamp.unsignedUpperBound()) {
@@ -337,7 +336,7 @@ public boolean detectCounted() {
                         } else if (!iv.isConstantStride() || Math.abs(iv.constantStride()) != 1 || initStamp.upperBound() > limitStamp.lowerBound()) {
                             return false;
                         }
-                    } else if (iv.direction() == Direction.Down) {
+                    } else if (iv.direction() == InductionVariable.Direction.Down) {
                         if (limitStamp.asConstant() != null && limitStamp.asConstant().asLong() == counterStamp.lowerBound()) {
                             // signed: MIN_INT > i
                         } else if (limitStamp.asConstant() != null && limitStamp.asConstant().asLong() == counterStamp.unsignedLowerBound()) {
@@ -354,14 +353,14 @@ public boolean detectCounted() {
                     unsigned = true; // fall through
                 case LE:
                     isLimitIncluded = true;
-                    if (iv.direction() != Direction.Up) {
+                    if (iv.direction() != InductionVariable.Direction.Up) {
                         return false;
                     }
                     break;
                 case BT:
                     unsigned = true; // fall through
                 case LT:
-                    if (iv.direction() != Direction.Up) {
+                    if (iv.direction() != InductionVariable.Direction.Up) {
                         return false;
                     }
                     break;
@@ -369,14 +368,14 @@ public boolean detectCounted() {
                     unsigned = true; // fall through
                 case GE:
                     isLimitIncluded = true;
-                    if (iv.direction() != Direction.Down) {
+                    if (iv.direction() != InductionVariable.Direction.Down) {
                         return false;
                     }
                     break;
                 case AT:
                     unsigned = true; // fall through
                 case GT:
-                    if (iv.direction() != Direction.Down) {
+                    if (iv.direction() != InductionVariable.Direction.Down) {
                         return false;
                     }
                     break;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopExpandableNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopExpandableNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
index a4162edbea07..6a99ab490cd3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopExpandableNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.graph.Node;
+import jdk.compiler.graal.graph.Node;
 
 /**
  * Marker interface for {@link Node} that can expand to loops later in the compilation pipeline via
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragment.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragment.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
index e43106046b20..4ebfcf011d60 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragment.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.GuardProxyNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.spi.NodeWithState;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.TriState;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
index 8565826bd0a0..fd15aa818941 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInside.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
@@ -22,67 +22,67 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardPhiNode;
-import org.graalvm.compiler.nodes.GuardProxyNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MemoryProxyNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.OpaqueNode;
-import org.graalvm.compiler.nodes.extended.OpaqueValueNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.util.IntegerHelper;
+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;
 
 public class LoopFragmentInside extends LoopFragment {
 
@@ -285,7 +285,7 @@ protected CompareNode placeNewSegmentAndCleanup(LoopEx loop, EconomicMap() {
+        duplicate.applyToNonVirtual(new VirtualState.NodePositionClosure<>() {
             @Override
             public void apply(Node from, Position p) {
                 ValueNode to = (ValueNode) p.get(from);
@@ -791,7 +791,7 @@ private AbstractBeginNode mergeEnds() {
                 ValueNode initializer = firstPhi;
                 if (duplicateState != null) {
                     // fix the merge's state after
-                    duplicateState.applyToNonVirtual(new NodePositionClosure<>() {
+                    duplicateState.applyToNonVirtual(new VirtualState.NodePositionClosure<>() {
                         @Override
                         public void apply(Node from, Position p) {
                             if (p.get(from) == phi) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInsideBefore.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInsideBefore.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
index a0fa881932ea..4953e9a9bfcc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInsideBefore.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.FixedNode;
+import jdk.compiler.graal.graph.NodeBitMap;
+import jdk.compiler.graal.nodes.FixedNode;
 
 public class LoopFragmentInsideBefore extends LoopFragmentInside {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInsideFrom.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInsideFrom.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
index dfcac3a3b522..6f08c21cc651 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentInsideFrom.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.FixedNode;
+import jdk.compiler.graal.graph.NodeBitMap;
+import jdk.compiler.graal.nodes.FixedNode;
 
 public class LoopFragmentInsideFrom extends LoopFragmentInside {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentWhole.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentWhole.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
index f70afd931952..cc41106274a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopFragmentWhole.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
-
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
+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;
 
 public class LoopFragmentWhole extends LoopFragment {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopPolicies.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopPolicies.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
index 483fec4ce83d..bfdb90309d98 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopPolicies.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.options.OptionType;
 
 public interface LoopPolicies {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopsData.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsData.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopsData.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsData.java
index af696d77dded..02f9e6d86d10 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopsData.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsData.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.util.ReversedList;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+import jdk.compiler.graal.core.common.cfg.Loop;
+import jdk.compiler.graal.core.common.util.ReversedList;
+import jdk.compiler.graal.debug.DebugContext;
 
 public class LoopsData {
     private final EconomicMap loopBeginToEx;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopsDataProviderImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopsDataProviderImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
index 2a509924e45d..7d23a7c8393d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/LoopsDataProviderImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
+import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
 
 public class LoopsDataProviderImpl implements LoopsDataProvider {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/MathUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/MathUtil.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/MathUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/MathUtil.java
index ff6a2c25969c..5770e3754a21 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/loop/MathUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/MathUtil.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.loop;
+package jdk.compiler.graal.nodes.loop;
 
 import java.util.function.BiFunction;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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;
 
 /**
  * Utility methods to perform integer math with some obvious constant folding first.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
index 625e84e11e54..bbcf5a9b9b2a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AbstractMemoryCheckpoint.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
+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;
 
 /**
  * Provides an implementation of {@link StateSplit}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
index fddc039169d6..4ce2783efa69 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AbstractWriteNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = {InputType.Memory, InputType.Guard}, cycles = CYCLES_2, size = SIZE_1)
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AddressableMemoryAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AddressableMemoryAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
index 685c86120cf3..2b3841b48774 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/AddressableMemoryAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+import jdk.compiler.graal.core.common.memory.BarrierType;
+import jdk.compiler.graal.nodes.memory.address.AddressNode;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/ExtendableMemoryAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/ExtendableMemoryAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
index da5205f18adb..18494261e130 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/ExtendableMemoryAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FixedWithNextNodeInterface;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
+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;
 
 /**
  * Nodes implementing this interface may be able to directly implement sign and/or zero extends as
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
index ef73284e3c57..2fd38a0b0d8c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FixedAccessNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ImplicitNullCheckNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
index 7c74abb7cd62..c587d2337d87 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatableAccessNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatableThreadLocalAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatableThreadLocalAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
index 631aa4363687..20ec56906a9f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatableThreadLocalAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.nodes.FixedNodeInterface;
+import jdk.compiler.graal.nodes.FixedNodeInterface;
 
 /**
  * Marker interface for fixed high-tier nodes involved in access to thread local variables. Nodes
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
index a6cddd2788dc..af4d03fe7cba 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatingAccessNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FloatingGuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 org.graalvm.word.LocationIdentity;
 
 @NodeInfo
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
index 721728ecad32..9c875e30ff93 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/FloatingReadNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
-
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/GuardedMemoryAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/GuardedMemoryAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
index 9f008662d4f3..e195270ddfdc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/GuardedMemoryAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+import jdk.compiler.graal.nodes.extended.GuardedNode;
+import jdk.compiler.graal.nodes.extended.GuardingNode;
 
 /**
  *
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
index fd4820162862..2ba3eedfcf02 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/LIRLowerableAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.nodes.spi.LIRLowerable;
+import jdk.compiler.graal.nodes.NodeView;
 
 public interface LIRLowerableAccess extends LIRLowerable, AddressableMemoryAccess {
     Stamp getAccessStamp(NodeView view);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
index 00c4ca58dcd6..e4df00dd9a03 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
index b4b03e8e2af5..c3e7d000ee19 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.StructuralInput.Memory;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = Memory, cycles = CYCLES_0, size = SIZE_0)
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryKill.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryKill.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
index 804879861f10..c00ca6c9c729 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryKill.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.graph.MemoryKillMarker;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
index 99793b5bc261..a552d83c82ab 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
index 71f854e44f9e..b7e4f7b3cab3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryMapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 @NodeInfo(allowedUsageTypes = {Extension, Memory}, cycles = CYCLES_0, size = SIZE_0)
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
index ca9e82902b67..3aae4b3257ab 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MemoryPhiNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MemoryProxyNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MultiMemoryKill.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MultiMemoryKill.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
index ad100539ded4..4e19ad2f8c22 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/MultiMemoryKill.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/OnHeapMemoryAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/OnHeapMemoryAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
index 0a2e11915218..6d73c00da5c2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/OnHeapMemoryAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
+import jdk.compiler.graal.core.common.memory.BarrierType;
 
 /**
  *
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/OrderedMemoryAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/OrderedMemoryAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
index 9a40736fe3fb..5895a09df2e5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/OrderedMemoryAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
+import jdk.compiler.graal.core.common.memory.MemoryOrderMode;
 
 /**
  * Nodes implementing this class have memory ordering requirements according to
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/ReadNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ReadNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/ReadNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ReadNode.java
index 86bfd8b5eb79..8e940c2d77a1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/ReadNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ReadNode.java
@@ -22,47 +22,47 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CanonicalizableLocation;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.ConstantFoldUtil;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.Constant;
@@ -145,7 +145,7 @@ public LocationIdentity getKilledLocationIdentity() {
         if (ordersMemoryAccesses()) {
             return LocationIdentity.any();
         }
-        return MemoryKill.NO_LOCATION;
+        return NO_LOCATION;
     }
 
     @SuppressWarnings("try")
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/SideEffectFreeWriteNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/SideEffectFreeWriteNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
index 2e1a8044b566..6c5f1104c8ef 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/SideEffectFreeWriteNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/SingleMemoryKill.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/SingleMemoryKill.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
index 217d71ff7431..8ea5a9472945 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/SingleMemoryKill.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
+package jdk.compiler.graal.nodes.memory;
 
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/WriteNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/WriteNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/WriteNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/WriteNode.java
index 7422638e7dae..4066d4b1e068 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/WriteNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/WriteNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory;
-
-import static org.graalvm.compiler.core.common.memory.MemoryOrderMode.VOLATILE;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.gc.WriteBarrier;
-import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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;
 import org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
index 9b2fccd173c6..869ce19a252c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/AddressNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory.address;
+package jdk.compiler.graal.nodes.memory.address;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.StructuralInput;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
+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;
 
 /**
  * Base class for nodes that deal with addressing calculation.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
index c1a54b9e5232..1611ca409e44 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/IndexAddressNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
@@ -22,13 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory.address;
+package jdk.compiler.graal.nodes.memory.address;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.JavaKind;
 
@@ -39,8 +40,8 @@
 public class IndexAddressNode extends AddressNode implements Lowerable {
     public static final NodeClass TYPE = NodeClass.create(IndexAddressNode.class);
 
-    @Input ValueNode array;
-    @Input ValueNode index;
+    @Node.Input ValueNode array;
+    @Node.Input ValueNode index;
 
     private final JavaKind arrayKind;
     private final JavaKind elementKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
index 9940d691d9c0..a4ceabd15651 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/memory/address/OffsetAddressNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.memory.address;
+package jdk.compiler.graal.nodes.memory.address;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
+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.vm.ci.meta.JavaKind;
 
@@ -51,8 +51,8 @@
 public class OffsetAddressNode extends AddressNode implements Canonicalizable {
     public static final NodeClass TYPE = NodeClass.create(OffsetAddressNode.class);
 
-    @Input ValueNode base;
-    @Input ValueNode offset;
+    @Node.Input ValueNode base;
+    @Node.Input ValueNode offset;
 
     public OffsetAddressNode(ValueNode base, ValueNode offset) {
         super(TYPE);
@@ -109,7 +109,7 @@ public Node canonical(CanonicalizerTool tool) {
         return this;
     }
 
-    @NodeIntrinsic
+    @Node.NodeIntrinsic
     public static native Address address(Object base, long offset);
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
index e9d1ed6a6d12..21897ee92884 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ArithmeticLIRLowerable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
+import jdk.compiler.graal.lir.gen.ArithmeticLIRGeneratorTool;
 
 public interface ArithmeticLIRLowerable extends LIRLowerable {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
index 73487a3d474b..2c6b82bb8b3c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ArrayLengthProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 public interface ArrayLengthProvider {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Canonicalizable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Canonicalizable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
index 6597feb40230..a99a53c71056 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Canonicalizable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.spi.BinaryCommutativeMarker;
-import org.graalvm.compiler.graph.spi.CanonicalizableMarker;
+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.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CanonicalizerTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CanonicalizerTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
index be067cd22025..2eaa42193a82 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CanonicalizerTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.Assumptions;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CoreProviders.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CoreProviders.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
index c5d4ec3fce0d..83a1db5aab36 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CoreProviders.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
index eef082e9f039..161d9dfd09c2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/CoreProvidersDelegate.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
index 1027df663666..a47766515470 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/DelegatingReplacements.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import java.util.BitSet;
 
-import org.graalvm.compiler.api.replacements.SnippetTemplateCache;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
index 15d6885ec95b..b29909818b3b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LIRLowerable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 public interface LIRLowerable {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
index 62299f28e258..3118d90599e4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LimitedValueProxy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.nodes.ValueNode;
 
 /**
  * This interface is like the derived {@link ValueProxy}. The difference is that only the graph
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoopsDataProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoopsDataProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
index 5a2076730b2a..d6b2e5d0d294 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoopsDataProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.loop.LoopsData;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.nodes.cfg.ControlFlowGraph;
+import jdk.compiler.graal.nodes.loop.LoopsData;
 
 /**
  * Provides capabilities for loop detection in a {@linkplain StructuredGraph}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Lowerable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Lowerable.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Lowerable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Lowerable.java
index 840c53b86b14..2535e75ef555 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Lowerable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Lowerable.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
 
 /**
  * Interface implemented by nodes that can replace themselves with lower level nodes during a phase
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
index 7705b3a3594c..06f89bb43eac 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoweringProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
@@ -22,16 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
-
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.RoundNode;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.memory.ExtendableMemoryAccess;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
@@ -103,8 +104,7 @@ public interface LoweringProvider {
     boolean divisionOverflowIsJVMSCompliant();
 
     /**
-     * Indicates whether this target platform supports uses
-     * {@link org.graalvm.compiler.lir.CastValue} for narrows.
+     * Indicates whether this target platform supports uses {@link CastValue} for narrows.
      */
     boolean narrowsUseCastValue();
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoweringTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoweringTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
index 568306751e9b..806fe9e787c1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/LoweringTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/MemoryEdgeProxy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/MemoryEdgeProxy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
index 4946541cea0f..90aea3bafeda 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/MemoryEdgeProxy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.nodes.memory.MemoryKill;
+import jdk.compiler.graal.nodes.memory.MemoryKill;
 import org.graalvm.word.LocationIdentity;
 
 public interface MemoryEdgeProxy extends Proxy, MemoryKill {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
similarity index 67%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
index 73aa025d577d..0774b506cef3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeLIRBuilderTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import java.util.List;
 
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
+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;
 
 public interface NodeLIRBuilderTool extends NodeValueMap {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
index 619e52d82ba3..8babcf883f53 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeValueMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.nodes.ValueNode;
 
 import jdk.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeWithState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeWithState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
index 6a4db45b7f0b..61425f0f0521 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/NodeWithState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.FixedNodeInterface;
-import org.graalvm.compiler.nodes.FrameState;
+import jdk.compiler.graal.graph.iterators.NodeIterable;
+import jdk.compiler.graal.nodes.FixedNodeInterface;
+import jdk.compiler.graal.nodes.FrameState;
 
 /**
  * Interface for nodes which have {@link FrameState} nodes as input.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/PlatformConfigurationProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/PlatformConfigurationProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
index 18e2528fd54a..dd991eedc866 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/PlatformConfigurationProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.nodes.gc.BarrierSet;
+import jdk.compiler.graal.nodes.gc.BarrierSet;
 
 public interface PlatformConfigurationProvider {
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ProfileProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ProfileProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
index 9be6e7218702..656214b10eac 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ProfileProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Proxy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Proxy.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Proxy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Proxy.java
index 5fc1336e57ae..c5436fd1a9ec 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Proxy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Proxy.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Replacements.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Replacements.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Replacements.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Replacements.java
index f877beb97830..206a1e0381a1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Replacements.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Replacements.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import java.util.BitSet;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.SnippetTemplateCache;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
@@ -86,7 +86,7 @@ StructuredGraph getSnippet(ResolvedJavaMethod method, ResolvedJavaMethod recursi
     SnippetParameterInfo getSnippetParameterInfo(ResolvedJavaMethod method);
 
     /**
-     * Return true if the method is a {@link org.graalvm.compiler.api.replacements.Snippet}.
+     * Return true if the method is a {@link Snippet}.
      */
     boolean isSnippet(ResolvedJavaMethod method);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ResolvedJavaMethodProfileProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ResolvedJavaMethodProfileProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
index 768a210bb61e..084ab47498eb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ResolvedJavaMethodProfileProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import jdk.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Simplifiable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Simplifiable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
index 63887082940c..a67a166a1c82 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Simplifiable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.spi.SimplifiableMarker;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.graph.spi.SimplifiableMarker;
 
 /**
  * This interface allows nodes to perform more complicated simplifications, in contrast to
  * {@link Canonicalizable}, which supports only replacing the current node.
  *
  * Implementors of this interface need to be aware that they need to call
- * {@link SimplifierTool#addToWorkList(org.graalvm.compiler.graph.Node)} for each node that might be
- * influenced (in terms of simplification and canonicalization) by the actions performed in
- * simplify.
+ * {@link SimplifierTool#addToWorkList(Node)} for each node that might be influenced (in terms of
+ * simplification and canonicalization) by the actions performed in simplify.
  */
 public interface Simplifiable extends SimplifiableMarker {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SimplifierTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SimplifierTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
index 64bb56d78cb0..2cef997a0f82 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SimplifierTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.graph.Node;
+import jdk.compiler.graal.graph.Node;
 
 /**
  * @see Simplifiable
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SnippetParameterInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SnippetParameterInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
index 7f0805a80da0..fe820c31629c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SnippetParameterInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 
-import org.graalvm.compiler.api.replacements.Snippet;
+import jdk.compiler.graal.api.replacements.Snippet;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Local;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StableProfileProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StableProfileProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
index 4916d22aa965..3592080e45b8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StableProfileProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.debug.TTY;
+import jdk.compiler.graal.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaMethodProfile;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StampInverter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampInverter.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StampInverter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampInverter.java
index 4a12e3b590df..8af2cb545dd6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StampInverter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampInverter.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.nodes.ValueNode;
 
 public interface StampInverter {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StampProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampProvider.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StampProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampProvider.java
index 8af713d1e051..64a4422c78df 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/StampProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
+import jdk.compiler.graal.core.common.type.AbstractPointerStamp;
+import jdk.compiler.graal.core.common.type.ObjectStamp;
+import jdk.compiler.graal.nodes.extended.LoadHubNode;
 
 /**
  * Provides a capability for creating platform dependent stamps.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SwitchFoldable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SwitchFoldable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
index 0a931c5ed75d..f178b335ffe0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/SwitchFoldable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
@@ -23,33 +23,33 @@
  * questions.
  */
 
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
 
+import jdk.compiler.graal.nodes.extended.IntegerSwitchNode;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * Nodes that implement this interface can be collapsed to a single IntegerSwitch when they are seen
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
index f08e7ad9a0d6..1b7361dc2ab4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/UncheckedInterfaceProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.core.common.type.Stamp;
+import jdk.compiler.graal.core.common.type.Stamp;
 
 public interface UncheckedInterfaceProvider {
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ValueProxy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ValueProxy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
index 5484243bf2b2..6cc21686d3d4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/ValueProxy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+import jdk.compiler.graal.nodes.extended.GuardingNode;
 
 /**
  * Special implementation of {@link LimitedValueProxy} that adds a guard to this value. Use in
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Virtualizable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Virtualizable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
index dc6f2041d7e2..b5dd422ae04d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/Virtualizable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
index f56380a9c793..14f0dfb6ca19 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/VirtualizableAllocation.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
index 88a5fd5d93f3..05e9f334769f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/VirtualizerTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import java.util.List;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/WordVerification.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/WordVerification.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/WordVerification.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/WordVerification.java
index ed9a13a91fe4..fabea39b3763 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/spi/WordVerification.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/WordVerification.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.spi;
+package jdk.compiler.graal.nodes.spi;
 
 import jdk.vm.ci.meta.JavaType;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
index 27ca4f975335..a325d3da92bb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/type/NarrowOopStamp.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.type;
-
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.MemoryAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/type/StampTool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/StampTool.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/type/StampTool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/StampTool.java
index 7460f25f97af..e6b28e8a6fd1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/type/StampTool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/StampTool.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.type;
+package jdk.compiler.graal.nodes.type;
 
 import java.util.Iterator;
 
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
index 1a742576f111..7c64450a34f8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/ConstantFoldUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
-
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider.ConstantFieldTool;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
+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;
 
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/ConstantReflectionUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/ConstantReflectionUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
index 63fb20dd74cb..c7644c06c532 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/ConstantReflectionUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
 import java.nio.ByteOrder;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/GraphUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/GraphUtil.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/GraphUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/GraphUtil.java
index c521c4c88286..bfa6deea4366 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/GraphUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/GraphUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,70 +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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.code.SourceStackTraceBailoutException;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.LinkedStack;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.NodeStack;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.extended.MultiGuardNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider.FindLengthMode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.spi.LimitedValueProxy;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.BailoutException;
 import jdk.vm.ci.code.BytecodePosition;
@@ -732,13 +731,14 @@ public static ValueNode skipPiWhileNonNullArray(ValueNode node) {
 
     /**
      * Returns the length of the array described by the value parameter, or null if it is not
-     * available. Details of the different modes are documented in {@link FindLengthMode}.
+     * available. Details of the different modes are documented in
+     * {@link ArrayLengthProvider.FindLengthMode}.
      *
      * @param value The start value.
-     * @param mode The mode as documented in {@link FindLengthMode}.
+     * @param mode The mode as documented in {@link ArrayLengthProvider.FindLengthMode}.
      * @return The array length if one was found, or null otherwise.
      */
-    public static ValueNode arrayLength(ValueNode value, FindLengthMode mode, ConstantReflectionProvider constantReflection) {
+    public static ValueNode arrayLength(ValueNode value, ArrayLengthProvider.FindLengthMode mode, ConstantReflectionProvider constantReflection) {
         return arrayLength(value, mode, constantReflection, null);
     }
 
@@ -749,7 +749,7 @@ private static ValueNode filterArrayLengthResult(ValueNode result, boolean allow
         return result == null || !allowOnlyConstantResult || result.isConstant() ? result : null;
     }
 
-    private static ValueNode arrayLength(ValueNode value, FindLengthMode mode, ConstantReflectionProvider constantReflection, EconomicMap visitedPhiInputs) {
+    private static ValueNode arrayLength(ValueNode value, ArrayLengthProvider.FindLengthMode mode, ConstantReflectionProvider constantReflection, EconomicMap visitedPhiInputs) {
         Objects.requireNonNull(mode);
 
         EconomicMap visitedPhiInputMap = visitedPhiInputs;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/IntegerHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/IntegerHelper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
index 49e9a5b35619..726d4779e0a4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/IntegerHelper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 public abstract class IntegerHelper {
     protected final int bits;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/JavaConstantFormattable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/JavaConstantFormattable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
index 214c4196a403..a4875255855e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/JavaConstantFormattable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
 /**
  * Performs special formatting of values involving {@link jdk.vm.ci.meta.JavaConstant JavaConstants}
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/JavaConstantFormatter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/JavaConstantFormatter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
index 1dc85d358a0a..1acfd9669f4d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/JavaConstantFormatter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/SignedIntegerHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/SignedIntegerHelper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
index 2470ecb92419..b4f5c6147f8d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/SignedIntegerHelper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
+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.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/UnsignedIntegerHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/UnsignedIntegerHelper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
index 5b1ad1a3c252..e668520abcbc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/util/UnsignedIntegerHelper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.util;
+package jdk.compiler.graal.nodes.util;
 
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
+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.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
index 34d0da2630f0..a9503f0641aa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/AllocatedObjectNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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.vm.ci.meta.ConstantReflectionProvider;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * Selects one object from a {@link CommitAllocationNode}. The object is identified by its
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
index 5d2013fd235f..d78c203d1a6d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/CommitAllocationNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
@@ -22,41 +22,41 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Association;
-import static org.graalvm.compiler.nodeinfo.InputType.Extension;
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+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 java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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 org.graalvm.word.LocationIdentity;
 
 // @formatter:off
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
index 4c9684eda880..00c4da25361f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/EnsureVirtualizedNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.GraalGraphError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class EnsureVirtualizedNode extends FixedWithNextNode implements Virtualizable, Lowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
index 95cc441fc4ea..d2b1c75581e0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/EscapeObjectState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.Iterator;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ValueNumberable;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.VirtualState;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public abstract class EscapeObjectState extends VirtualState implements ValueNumberable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/LockState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/LockState.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/LockState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/LockState.java
index 991ea0364f93..41e57c36ce41 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/LockState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/LockState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/MaterializedObjectState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/MaterializedObjectState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
index 7c93c05221c0..1eb862e01937 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/MaterializedObjectState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.compiler.graal.nodes.ValueNode;
 
 /**
  * This class encapsulated the materialized state of an escape analyzed object.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
index 908ec85b4e45..d10a7dbcae0d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
 import java.nio.ByteOrder;
 
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
index 277969af6c91..f69b80ae1c61 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualBoxingNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
+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 org.graalvm.compiler.nodes.spi.VirtualizerTool;
+import jdk.compiler.graal.nodes.spi.VirtualizerTool;
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
index b5c892975579..03d88d990b3e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualInstanceNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
-
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
index 0df1cf3dd373..985045d1c9fa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualObjectNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+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;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualObjectState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualObjectState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
index 0eedae2273f5..b8deafc56add 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/nodes/virtual/VirtualObjectState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.nodes.virtual;
+package jdk.compiler.graal.nodes.virtual;
 
 import java.util.List;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * This class encapsulated the virtual state of an escape analyzed object.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/EnumMultiOptionKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/EnumMultiOptionKey.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
index 109b4ca734ab..2a49eed8a329 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/EnumMultiOptionKey.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.util.EnumSet;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/EnumOptionKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumOptionKey.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/EnumOptionKey.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumOptionKey.java
index 43a7fc80a38d..2555ce7c1e31 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/EnumOptionKey.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumOptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.util.EnumSet;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ExcludeFromJacocoGeneratedReport.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ExcludeFromJacocoGeneratedReport.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
index 46e6b3cc6430..4922dcada05d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ExcludeFromJacocoGeneratedReport.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.TYPE;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ExcludeFromJacocoInstrumentation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ExcludeFromJacocoInstrumentation.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
index 25fa4aa43447..d5d361bb0ce2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ExcludeFromJacocoInstrumentation.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import static java.lang.annotation.ElementType.METHOD;
 import static java.lang.annotation.ElementType.PACKAGE;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ModifiableOptionValues.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ModifiableOptionValues.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ModifiableOptionValues.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ModifiableOptionValues.java
index 15fc7c83028c..773ac71994e9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/ModifiableOptionValues.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ModifiableOptionValues.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -110,7 +110,7 @@ public void update(UnmodifiableEconomicMap, Object> values) {
 
     @Override
     protected  T get(OptionKey key) {
-        return OptionValues.get(v.get(), key);
+        return get(v.get(), key);
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
index 04aea8c45830..71961f006113 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/NestedBooleanOptionKey.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 /**
  * A nested Boolean {@link OptionKey} that can be overridden by a {@link #parentOption parent
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OWNERS.toml b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OWNERS.toml
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/Option.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/Option.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/Option.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/Option.java
index 2801ac198a6d..982b9b7f1b74 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/Option.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/Option.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptor.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptor.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptor.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptor.java
index 6938e6195be3..666c5914adfd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptor.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptor.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.util.Arrays;
 import java.util.Collections;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptors.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptors.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptors.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptors.java
index db1495c9ce61..0e81e04b8109 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptors.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptors.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 /**
  * An interface to a set of {@link OptionDescriptor}s.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptorsMap.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptorsMap.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
index abc226e2abe3..b515d0cef178 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionDescriptorsMap.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.util.Iterator;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionGroup.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionGroup.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionGroup.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionGroup.java
index 41e23ad6c081..3bcb45588bef 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionGroup.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionGroup.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionKey.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionKey.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionKey.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionKey.java
index 9f2ca00c0510..3cdc342b949b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionKey.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionKey.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.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 org.graalvm.compiler.options.processor.OptionProcessor annotation processor.");
+            result.append(" annotation without a dependency on the jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/options/OptionStability.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionStability.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionStability.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionStability.java
index 6e15f7f6abf8..4d7efeb59748 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionStability.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionStability.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 /**
  * Categorizes options according to their stability.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionType.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionType.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionType.java
index 8ef008db6cf0..7cfbc4f8eed5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionType.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 /**
  * Classifies Graal options in several categories depending on who this option is relevant for.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionValues.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionValues.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionValues.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionValues.java
index c3c5d62f7745..a833b5148a9f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionValues.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionValues.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import java.io.PrintStream;
 import java.util.ArrayList;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionsParser.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionsParser.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionsParser.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionsParser.java
index 8ba14480edc1..4b0caf2a8d52 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/options/OptionsParser.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionsParser.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.options;
+package jdk.compiler.graal.options;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/BasePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/BasePhase.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/BasePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/BasePhase.java
index e9c7aab2df84..e168f2782338 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/BasePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/BasePhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.CompilerPhaseScope;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.MemUseTrackerKey;
-import org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.Mark;
-import org.graalvm.compiler.graph.Graph.NodeEvent;
-import org.graalvm.compiler.graph.Graph.NodeEventListener;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
-import org.graalvm.compiler.phases.contract.PhaseSizeContract;
+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.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.SpeculationLog;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/ClassTypeSequence.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/ClassTypeSequence.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/ClassTypeSequence.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/ClassTypeSequence.java
index 33b448fe86f1..d76bfffbec48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/ClassTypeSequence.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/ClassTypeSequence.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.JavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/FloatingGuardPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/FloatingGuardPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
index 32f3d39c4e94..dbee058f05b4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/FloatingGuardPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
 /**
  * Marker interface for phases that require floating guards.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/LazyName.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/LazyName.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/LazyName.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/LazyName.java
index 838bf05dcab5..d6e6b8d34f48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/LazyName.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/LazyName.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
-import org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/phases/OptimisticOptimizations.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/OptimisticOptimizations.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
index dcdc34f1f499..4c4ca77488b2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/OptimisticOptimizations.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
 import java.util.EnumSet;
 import java.util.Set;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.core.common.GraalOptions;
+import jdk.compiler.graal.options.OptionValues;
 
 import jdk.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.ProfilingInfo;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/Phase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Phase.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/Phase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Phase.java
index 797c83a6fc08..9c713dc61c97 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/Phase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Phase.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.nodes.StructuredGraph;
 
 /**
  * Base class for compiler phases that don't need a context object.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/PhaseSuite.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PhaseSuite.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/PhaseSuite.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PhaseSuite.java
index d4e6ee737829..e68133eceda4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/PhaseSuite.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PhaseSuite.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -34,12 +34,12 @@
 import java.util.Optional;
 import java.util.function.Supplier;
 
-import org.graalvm.compiler.core.common.util.PhasePlan;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+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.vm.ci.services.Services;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/PlaceholderPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PlaceholderPhase.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/PlaceholderPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PlaceholderPhase.java
index 085ad61e5998..f2230316309e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/PlaceholderPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PlaceholderPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.nodes.GraphState;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/phases/SingleRunSubphase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/SingleRunSubphase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/SingleRunSubphase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/SingleRunSubphase.java
index d3d982fd3ee4..64e8a9627037 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/SingleRunSubphase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/SingleRunSubphase.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.nodes.StructuredGraph;
 
 /**
  * A subclass of {@link BasePhase} whose instances may only be
- * {@linkplain #apply(org.graalvm.compiler.nodes.StructuredGraph, Object, boolean) applied} once. An
- * error will be raised at runtime if a single instance of such a phase is applied more than once,
- * whether or not it is applied to the same graph as before.
+ * {@linkplain #apply(StructuredGraph, Object, boolean) applied} once. An error will be raised at
+ * runtime if a single instance of such a phase is applied more than once, whether or not it is
+ * applied to the same graph as before.
  * 

  *
  * Such phases are typically used as part of another phase, allocated and immediately applied like
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/Speculative.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Speculative.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/Speculative.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Speculative.java
index 4c8c86179da9..71634e79b207 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/Speculative.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Speculative.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
-import org.graalvm.compiler.nodes.GraphState;
+import jdk.compiler.graal.nodes.GraphState;
 
 import jdk.vm.ci.meta.SpeculationLog;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/VerifyPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/VerifyPhase.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/VerifyPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/VerifyPhase.java
index ed7d0b5ae3c4..cca282043739 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/VerifyPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/VerifyPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
index 870bf8cf0d6b..39a7c6b0fcd5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AbstractInliningPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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;
 
 /**
  * Common superclass for phases that perform inlining.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringByNodePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringByNodePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
index da610150a724..9ad6299fab23 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringByNodePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * A phase the visits each address node and lowers into a machine dependent form.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
index a92a80f103f2..92626be6403e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringByUsePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
@@ -23,26 +23,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PrefetchAllocateNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.memory.AbstractWriteNode;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
index 1029212622e4..27cef77de486 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/AddressLoweringPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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;
 
 /**
  * The base class of all phases that lower {@link AddressNode} into a machine dependent nodes.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BarrierSetVerificationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BarrierSetVerificationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
index 5fafffec24f5..1574fcdb7e6b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BarrierSetVerificationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
@@ -22,23 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
-
-import static org.graalvm.compiler.phases.BasePhase.NotApplicable.ifAny;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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;
 
 public class BarrierSetVerificationPhase extends BasePhase {
 
     @Override
     public Optional notApplicableTo(GraphState graphState) {
-        return ifAny(BasePhase.NotApplicable.unlessRunAfter(this, GraphState.StageFlag.LOW_TIER_LOWERING, graphState),
+        return NotApplicable.ifAny(BasePhase.NotApplicable.unlessRunAfter(this, GraphState.StageFlag.LOW_TIER_LOWERING, graphState),
                         BasePhase.NotApplicable.unlessRunBefore(this, GraphState.StageFlag.ADDRESS_LOWERING, graphState));
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BoxNodeIdentityPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BoxNodeIdentityPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
index 2814104c64c3..adb435e5b572 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BoxNodeIdentityPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.BoxNode.TrustedBoxedValue;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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;
 
 /**
  * Find code patterns that appear to assume identity of boxes. That is where two box values are
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BoxNodeOptimizationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BoxNodeOptimizationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
index ffe0fce6f979..3c436a88f831 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/BoxNodeOptimizationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 /**
  * Try to replace box operations with dominating box operations.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
index 076058a5c1db..de4b9e85b75a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/CanonicalizerPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
@@ -22,68 +22,68 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.CFG_SIMPLIFICATION;
-import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.DEAD_PHI_CYCLE_DETECTION;
-import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.GVN;
-import static org.graalvm.compiler.phases.common.CanonicalizerPhase.CanonicalizerFeature.READ_CANONICALIZATION;
+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 java.util.EnumSet;
 import java.util.Objects;
 import java.util.Optional;
 
+import jdk.compiler.graal.phases.BasePhase;
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.GraalGraphError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.Mark;
-import org.graalvm.compiler.graph.Graph.NodeEventListener;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeFlood;
-import org.graalvm.compiler.graph.NodeWorkList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.loop.InductionVariable;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
index 873a1a470842..b4ca87da6751 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ConditionalEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
@@ -22,96 +22,85 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.nodes.StaticDeoptimizingNode.mergeActions;
-import static org.graalvm.compiler.phases.common.ConditionalEliminationUtil.getOtherSafeStamp;
-import static org.graalvm.compiler.phases.common.ConditionalEliminationUtil.getSafeStamp;
-import static org.graalvm.compiler.phases.common.ConditionalEliminationUtil.rewireGuards;
+import static jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.And;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeStack;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.ConditionAnchorNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.DeoptimizingGuard;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.GuardProxyNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.UnaryOpLogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AndNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.CaptureStateBeginNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.OpaqueLogicNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.TypeSwitchNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.NodeWithState;
-import org.graalvm.compiler.nodes.spi.StampInverter;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.GuardFolding;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.GuardRewirer;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.GuardedCondition;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.InfoElement;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.InfoElementProvider;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.InputFilter;
-import org.graalvm.compiler.phases.common.ConditionalEliminationUtil.Marks;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
+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.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.SpeculationLog.Speculation;
@@ -197,7 +186,7 @@ protected void run(StructuredGraph graph, CoreProviders context) {
                     cfg.visitDominatorTree(new MoveGuardsUpwards(), graph.isBeforeStage(StageFlag.VALUE_PROXY_REMOVAL));
                 }
                 try (DebugContext.Scope scheduleScope = graph.getDebug().scope(SchedulePhase.class)) {
-                    SchedulePhase.run(graph, SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER, cfg, context, false);
+                    SchedulePhase.run(graph, SchedulePhase.SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER, cfg, context, false);
                 } catch (Throwable t) {
                     throw graph.getDebug().handle(t);
                 }
@@ -370,16 +359,16 @@ public void exit(HIRBlock b, HIRBlock value) {
 
     private static final class PhiInfoElement {
 
-        private EconomicMap infoElements;
+        private EconomicMap infoElements;
 
-        public void set(EndNode end, InfoElement infoElement) {
+        public void set(EndNode end, ConditionalEliminationUtil.InfoElement infoElement) {
             if (infoElements == null) {
                 infoElements = EconomicMap.create(Equivalence.IDENTITY);
             }
             infoElements.put(end, infoElement);
         }
 
-        public InfoElement get(EndNode end) {
+        public ConditionalEliminationUtil.InfoElement get(EndNode end) {
             if (infoElements == null) {
                 return null;
             }
@@ -387,8 +376,8 @@ public InfoElement get(EndNode end) {
         }
     }
 
-    public static class Instance implements ControlFlowGraph.RecursiveVisitor {
-        protected final NodeMap map;
+    public static class Instance implements ControlFlowGraph.RecursiveVisitor {
+        protected final NodeMap map;
         protected final BlockMap> blockToNodes;
         protected final NodeMap nodeToBlock;
         protected final CanonicalizerTool tool;
@@ -396,10 +385,10 @@ public static class Instance implements ControlFlowGraph.RecursiveVisitor
         protected final StructuredGraph graph;
         protected final DebugContext debug;
         protected final EconomicMap> mergeMaps;
-        private final InfoElementProvider infoElementProvider;
-        private final GuardFolding guardFolding;
+        private final ConditionalEliminationUtil.InfoElementProvider infoElementProvider;
+        private final ConditionalEliminationUtil.GuardFolding guardFolding;
 
-        protected final ArrayDeque conditions;
+        protected final ArrayDeque conditions;
 
         /**
          * Tests which may be eliminated because post dominating tests to prove a broader condition.
@@ -417,17 +406,17 @@ public Instance(StructuredGraph graph, BlockMap> blockToNodes, NodeMa
             this.conditions = new ArrayDeque<>();
             tool = GraphUtil.getDefaultSimplifier(context, false, graph.getAssumptions(), graph.getOptions());
             mergeMaps = EconomicMap.create(Equivalence.IDENTITY);
-            infoElementProvider = new InfoElementProvider() {
+            infoElementProvider = new ConditionalEliminationUtil.InfoElementProvider() {
 
                 @Override
-                public InfoElement infoElements(ValueNode value) {
+                public ConditionalEliminationUtil.InfoElement infoElements(ValueNode value) {
                     return getInfoElements(value);
                 }
             };
-            guardFolding = new GuardFolding() {
+            guardFolding = new ConditionalEliminationUtil.GuardFolding() {
 
                 @Override
-                public boolean foldGuard(DeoptimizingGuard thisGuard, ValueNode original, Stamp newStamp, GuardRewirer rewireGuardFunction) {
+                public boolean foldGuard(DeoptimizingGuard thisGuard, ValueNode original, Stamp newStamp, ConditionalEliminationUtil.GuardRewirer rewireGuardFunction) {
                     return foldPendingTest(thisGuard, original, newStamp, rewireGuardFunction);
                 }
             };
@@ -590,7 +579,7 @@ private void processValueAnchor(ValueAnchorNode node) {
         }
 
         private void tryImproveAnchoredPi(PiNode piNode) {
-            InfoElement infoElement = infoElementProvider.infoElements(piNode.object());
+            ConditionalEliminationUtil.InfoElement infoElement = infoElementProvider.infoElements(piNode.object());
             while (infoElement != null) {
                 Stamp joinedStamp = infoElement.getStamp().join(piNode.piStamp());
                 if (joinedStamp.equals(infoElement.getStamp())) {
@@ -613,14 +602,14 @@ private void tryImproveAnchoredPi(PiNode piNode) {
         }
 
         @Override
-        public Marks enter(HIRBlock block) {
+        public ConditionalEliminationUtil.Marks enter(HIRBlock block) {
             int infoElementsMark = undoOperations.size();
             int conditionsMark = conditions.size();
             debug.log("[Pre Processing block %s]", block);
             // For now conservatively collect guards only within the same block.
             pendingTests.clear();
             processNodes(block);
-            return new Marks(infoElementsMark, conditionsMark);
+            return new ConditionalEliminationUtil.Marks(infoElementsMark, conditionsMark);
         }
 
         protected void processNodes(HIRBlock block) {
@@ -705,7 +694,7 @@ protected void introducePisForPhis(MergeNode merge) {
                     for (int i = 0; i < phi.valueCount(); ++i) {
                         ValueNode valueAt = phi.valueAt(i);
                         Stamp curBestStamp = valueAt.stamp(NodeView.DEFAULT);
-                        InfoElement infoElement = phiInfoElements.get(merge.forwardEndAt(i));
+                        ConditionalEliminationUtil.InfoElement infoElement = phiInfoElements.get(merge.forwardEndAt(i));
                         if (infoElement != null) {
                             curBestStamp = curBestStamp.join(infoElement.getStamp());
                         }
@@ -755,7 +744,7 @@ protected void introducePisForPhis(MergeNode merge) {
                                 if (bestPossibleStamp.meet(valueAt.stamp(NodeView.DEFAULT)).equals(bestPossibleStamp)) {
                                     // Pi not required here.
                                 } else {
-                                    InfoElement infoElement = phiInfoElements.get(merge.forwardEndAt(i));
+                                    ConditionalEliminationUtil.InfoElement infoElement = phiInfoElements.get(merge.forwardEndAt(i));
                                     assert infoElement != null;
                                     Stamp curBestStamp = infoElement.getStamp();
                                     ValueNode input = infoElement.getProxifiedInput();
@@ -782,7 +771,7 @@ protected void processEnd(EndNode end) {
                 EconomicMap mergeMap = this.mergeMaps.get(merge);
                 for (ValuePhiNode phi : merge.valuePhis()) {
                     ValueNode valueAt = phi.valueAt(end);
-                    InfoElement infoElement = this.getInfoElements(valueAt);
+                    ConditionalEliminationUtil.InfoElement infoElement = this.getInfoElements(valueAt);
                     while (infoElement != null) {
                         Stamp newStamp = infoElement.getStamp();
                         if (phi.stamp(NodeView.DEFAULT).tryImproveWith(newStamp) != null) {
@@ -849,12 +838,12 @@ protected void registerNewCondition(LogicNode condition, boolean negated, Guardi
                 }
 
                 if (!x.isConstant() && maybeMultipleUsages(x)) {
-                    Stamp newStampX = binaryOpLogicNode.getSucceedingStampForX(negated, getSafeStamp(x), getOtherSafeStamp(y));
+                    Stamp newStampX = binaryOpLogicNode.getSucceedingStampForX(negated, ConditionalEliminationUtil.getSafeStamp(x), ConditionalEliminationUtil.getOtherSafeStamp(y));
                     registerNewStamp(x, newStampX, guard);
                 }
 
                 if (!y.isConstant() && maybeMultipleUsages(y)) {
-                    Stamp newStampY = binaryOpLogicNode.getSucceedingStampForY(negated, getOtherSafeStamp(x), getSafeStamp(y));
+                    Stamp newStampY = binaryOpLogicNode.getSucceedingStampForY(negated, ConditionalEliminationUtil.getOtherSafeStamp(x), ConditionalEliminationUtil.getSafeStamp(y));
                     registerNewStamp(y, newStampY, guard);
                 }
 
@@ -869,7 +858,7 @@ protected void registerNewCondition(LogicNode condition, boolean negated, Guardi
                              * known to be set.
                              */
                             BinaryOp op = ArithmeticOpTable.forStamp(x.stamp(NodeView.DEFAULT)).getOr();
-                            IntegerStamp newStampX = (IntegerStamp) op.foldStamp(getSafeStamp(andX), getOtherSafeStamp(y));
+                            IntegerStamp newStampX = (IntegerStamp) op.foldStamp(ConditionalEliminationUtil.getSafeStamp(andX), ConditionalEliminationUtil.getOtherSafeStamp(y));
                             registerNewStamp(andX, newStampX, guard);
                         }
                     }
@@ -901,7 +890,7 @@ protected void registerNewCondition(LogicNode condition, boolean negated, Guardi
          *     ...
          * 

          */
-        protected boolean foldPendingTest(DeoptimizingGuard thisGuard, ValueNode original, Stamp newStamp, GuardRewirer rewireGuardFunction) {
+        protected boolean foldPendingTest(DeoptimizingGuard thisGuard, ValueNode original, Stamp newStamp, ConditionalEliminationUtil.GuardRewirer rewireGuardFunction) {
             for (DeoptimizingGuard pendingGuard : pendingTests) {
                 LogicNode pendingCondition = pendingGuard.getCondition();
                 TriState result = TriState.UNKNOWN;
@@ -915,14 +904,14 @@ protected boolean foldPendingTest(DeoptimizingGuard thisGuard, ValueNode origina
                     ValueNode x = binaryOpLogicNode.getX();
                     ValueNode y = binaryOpLogicNode.getY();
                     if (x == original) {
-                        result = binaryOpLogicNode.tryFold(newStamp, getOtherSafeStamp(y));
+                        result = binaryOpLogicNode.tryFold(newStamp, ConditionalEliminationUtil.getOtherSafeStamp(y));
                     } else if (y == original) {
-                        result = binaryOpLogicNode.tryFold(getOtherSafeStamp(x), newStamp);
+                        result = binaryOpLogicNode.tryFold(ConditionalEliminationUtil.getOtherSafeStamp(x), newStamp);
                     } else if (binaryOpLogicNode instanceof IntegerEqualsNode && y.isConstant() && x instanceof AndNode) {
                         AndNode and = (AndNode) x;
                         if (and.getY() == y && and.getX() == original) {
                             BinaryOp andOp = ArithmeticOpTable.forStamp(newStamp).getAnd();
-                            result = binaryOpLogicNode.tryFold(andOp.foldStamp(newStamp, getOtherSafeStamp(y)), getOtherSafeStamp(y));
+                            result = binaryOpLogicNode.tryFold(andOp.foldStamp(newStamp, ConditionalEliminationUtil.getOtherSafeStamp(y)), ConditionalEliminationUtil.getOtherSafeStamp(y));
                         }
                     }
                 }
@@ -955,12 +944,12 @@ private boolean canScheduleAbove(Node n, Node target, ValueNode knownToBeAbove)
                     return true;
                 }
             }
-            InputFilter v = new InputFilter(knownToBeAbove);
+            ConditionalEliminationUtil.InputFilter v = new ConditionalEliminationUtil.InputFilter(knownToBeAbove);
             n.applyInputs(v);
             return v.ok;
         }
 
-        protected boolean foldGuard(DeoptimizingGuard thisGuard, DeoptimizingGuard otherGuard, boolean outcome, Stamp guardedValueStamp, GuardRewirer rewireGuardFunction) {
+        protected boolean foldGuard(DeoptimizingGuard thisGuard, DeoptimizingGuard otherGuard, boolean outcome, Stamp guardedValueStamp, ConditionalEliminationUtil.GuardRewirer rewireGuardFunction) {
             DeoptimizationAction action = mergeActions(otherGuard.getAction(), thisGuard.getAction());
             if (action != null && otherGuard.getSpeculation() == thisGuard.getSpeculation()) {
                 LogicNode condition = (LogicNode) thisGuard.getCondition().copyWithInputs();
@@ -977,7 +966,7 @@ protected boolean foldGuard(DeoptimizingGuard thisGuard, DeoptimizingGuard other
                  */
                 // for the second case, the action of the deopt is copied from there:
                 thisGuard.setAction(action);
-                GuardRewirer rewirer = (guard, result, innerGuardedValueStamp, newInput) -> {
+                ConditionalEliminationUtil.GuardRewirer rewirer = (guard, result, innerGuardedValueStamp, newInput) -> {
                     // `result` is `outcome`, `guard` is `otherGuard`
                     boolean mustDeopt = result == otherGuard.isNegated();
                     if (rewireGuardFunction.rewire(guard, mustDeopt == thisGuard.isNegated(), innerGuardedValueStamp, newInput)) {
@@ -993,12 +982,12 @@ protected boolean foldGuard(DeoptimizingGuard thisGuard, DeoptimizingGuard other
                     return false;
                 };
                 // Move the later test up
-                return rewireGuards(otherGuard, outcome, null, guardedValueStamp, rewirer);
+                return ConditionalEliminationUtil.rewireGuards(otherGuard, outcome, null, guardedValueStamp, rewirer);
             }
             return false;
         }
 
-        protected boolean tryProveGuardCondition(DeoptimizingGuard thisGuard, LogicNode node, GuardRewirer rewireGuardFunction) {
+        protected boolean tryProveGuardCondition(DeoptimizingGuard thisGuard, LogicNode node, ConditionalEliminationUtil.GuardRewirer rewireGuardFunction) {
             return ConditionalEliminationUtil.tryProveGuardCondition(infoElementProvider, conditions, guardFolding, thisGuard, node, rewireGuardFunction);
         }
 
@@ -1009,22 +998,22 @@ protected void registerCondition(LogicNode condition, boolean negated, GuardingN
             if (condition.hasMoreThanOneUsage()) {
                 registerNewStamp(condition, negated ? StampFactory.contradiction() : StampFactory.tautology(), guard);
             }
-            conditions.push(new GuardedCondition(guard, condition, negated));
+            conditions.push(new ConditionalEliminationUtil.GuardedCondition(guard, condition, negated));
         }
 
-        protected InfoElement getInfoElements(ValueNode proxiedValue) {
+        protected ConditionalEliminationUtil.InfoElement getInfoElements(ValueNode proxiedValue) {
             if (proxiedValue == null) {
                 return null;
             }
-            InfoElement infoElement = map.getAndGrow(proxiedValue);
+            ConditionalEliminationUtil.InfoElement infoElement = map.getAndGrow(proxiedValue);
             if (infoElement == null) {
                 infoElement = map.getAndGrow(GraphUtil.skipPi(proxiedValue));
             }
             return infoElement;
         }
 
-        private InfoElement nextElement(InfoElement current) {
-            InfoElement parent = current.getParent();
+        private ConditionalEliminationUtil.InfoElement nextElement(ConditionalEliminationUtil.InfoElement current) {
+            ConditionalEliminationUtil.InfoElement parent = current.getParent();
             if (parent != null) {
                 return parent;
             } else {
@@ -1060,7 +1049,7 @@ protected void registerNewStamp(ValueNode maybeProxiedValue, Stamp newStamp, Gua
                 counterStampsRegistered.increment(debug);
                 debug.log("\t Saving stamp for node %s stamp %s guarded by %s", value, stamp, guard);
                 assert value instanceof LogicNode || stamp.isCompatible(value.stamp(NodeView.DEFAULT)) : stamp + " vs. " + value.stamp(NodeView.DEFAULT) + " (" + value + ")";
-                map.setAndGrow(value, new InfoElement(stamp, guard, proxiedValue, map.getAndGrow(value)));
+                map.setAndGrow(value, new ConditionalEliminationUtil.InfoElement(stamp, guard, proxiedValue, map.getAndGrow(value)));
                 undoOperations.push(value);
                 if (propagateThroughPis && value instanceof PiNode) {
                     PiNode piNode = (PiNode) value;
@@ -1126,7 +1115,7 @@ protected void processTypeSwitch(AbstractBeginNode beginNode, TypeSwitchNode typ
         }
 
         @Override
-        public void exit(HIRBlock b, Marks marks) {
+        public void exit(HIRBlock b, ConditionalEliminationUtil.Marks marks) {
             int infoElementsMark = marks.infoElementOperations;
             while (undoOperations.size() > infoElementsMark) {
                 Node node = undoOperations.pop();
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ConditionalEliminationUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ConditionalEliminationUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
index 6b0b51ae137f..7b3d0cf308a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ConditionalEliminationUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.ArrayDeque;
 
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.Or;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.DeoptimizingGuard;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ShortCircuitOrNode;
-import org.graalvm.compiler.nodes.UnaryOpLogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AndNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.TriState;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
index 9d2dd3aa163a..d093d61e7b2a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DeadCodeEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeFlood;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.Phase;
+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;
 
 public class DeadCodeEliminationPhase extends Phase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
index 80a5e7d17224..eaf2fb7ba866 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DeoptimizationGroupingPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.nodes.AbstractDeoptimizeNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.DynamicDeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
+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;
 
 /**
  * This phase tries to find {@link AbstractDeoptimizeNode DeoptimizeNodes} which use the same
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DisableOverflownCountedLoopsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DisableOverflownCountedLoopsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
index 2809816f68d1..2f6fe0919f2d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DisableOverflownCountedLoopsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.Phase;
+import jdk.compiler.graal.nodes.GraphState;
+import jdk.compiler.graal.nodes.LoopBeginNode;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.phases.Phase;
 
 /*
  * Phase that disables counted loop detection for loops that have deopted in previous compiled versions
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
index 39b915b23d99..39cb34c48848 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/DominatorBasedGlobalValueNumberingPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
@@ -22,52 +22,52 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Optional;
 
+import jdk.compiler.graal.phases.util.GraphOrder;
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.FixedBinaryNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.HIRLoop;
-import org.graalvm.compiler.nodes.cfg.LocationSet;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.util.GraphOrder;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
index cf12c10e3a86..073f10ca6a6d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ExpandLogicPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
@@ -22,34 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardPhiNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ShortCircuitOrNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AbstractNormalizeCompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
+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;
 
 public class ExpandLogicPhase extends PostRunCanonicalizationPhase {
     private static final double EPSILON = 1E-6;
@@ -59,11 +60,11 @@ public ExpandLogicPhase(CanonicalizerPhase canonicalizer) {
     }
 
     @Override
-    public Optional notApplicableTo(GraphState graphState) {
-        return NotApplicable.ifAny(
+    public Optional notApplicableTo(GraphState graphState) {
+        return BasePhase.NotApplicable.ifAny(
                         super.notApplicableTo(graphState),
-                        NotApplicable.ifApplied(this, StageFlag.EXPAND_LOGIC, graphState),
-                        NotApplicable.unlessRunAfter(this, StageFlag.LOW_TIER_LOWERING, graphState));
+                        BasePhase.NotApplicable.ifApplied(this, StageFlag.EXPAND_LOGIC, graphState),
+                        BasePhase.NotApplicable.unlessRunAfter(this, StageFlag.LOW_TIER_LOWERING, graphState));
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FinalCanonicalizerPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FinalCanonicalizerPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
index 3ddf97bdbb70..bbbbc182a674 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FinalCanonicalizerPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 /**
  * Final application of {@link CanonicalizerPhase}. After the application of this phase, no further
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FixReadsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FixReadsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
index ba0ce493ab7c..04c1c82bbc8f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FixReadsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
@@ -22,68 +22,68 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeStack;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.graph.iterators.NodePredicate;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BinaryOpLogicNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.UnaryOpLogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph.RecursiveVisitor;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.FloatingAccessNode;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.graph.ScheduledNodeIterator;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Constant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
index da223cb72235..3c3288bff168 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FloatingReadPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.graph.Graph.NodeEvent.NODE_ADDED;
-import static org.graalvm.compiler.graph.Graph.NodeEvent.ZERO_USAGES;
+import static jdk.compiler.graal.graph.Graph.NodeEvent.NODE_ADDED;
+import static jdk.compiler.graal.graph.Graph.NodeEvent.ZERO_USAGES;
 import static org.graalvm.word.LocationIdentity.any;
 import static org.graalvm.word.LocationIdentity.init;
 
@@ -34,52 +34,50 @@
 import java.util.List;
 import java.util.Optional;
 
+import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MemoryMapControlSinkNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.HIRLoop;
-import org.graalvm.compiler.nodes.memory.AddressableMemoryAccess;
-import org.graalvm.compiler.nodes.memory.FloatableAccessNode;
-import org.graalvm.compiler.nodes.memory.FloatingAccessNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryAnchorNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MemoryMap;
-import org.graalvm.compiler.nodes.memory.MemoryMapNode;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
+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 org.graalvm.word.LocationIdentity;
 
 public class FloatingReadPhase extends PostRunCanonicalizationPhase {
@@ -308,7 +306,7 @@ private static boolean checkNoImmutableLocations(EconomicSet k
         return true;
     }
 
-    public static class FloatingReadClosure extends NodeIteratorClosure {
+    public static class FloatingReadClosure extends ReentrantNodeIterator.NodeIteratorClosure {
 
         private final EconomicMap> modifiedInLoops;
         private boolean createFloatingReads;
@@ -467,7 +465,7 @@ protected EconomicMap processLoop(LoopBeginNode loo
             }
             initialState.getMap().putAll(phis);
 
-            LoopInfo loopInfo = ReentrantNodeIterator.processLoop(this, loop, initialState);
+            ReentrantNodeIterator.LoopInfo loopInfo = ReentrantNodeIterator.processLoop(this, loop, initialState);
 
             UnmodifiableMapCursor endStateCursor = loopInfo.endStates.getEntries();
             while (endStateCursor.advance()) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
index ee1475d4fa60..1cec8ed59fde 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/FrameStateAssignmentPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
@@ -22,31 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.List;
 import java.util.Optional;
 
+import jdk.compiler.graal.phases.Phase;
+import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.FrameStateVerification;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
+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.vm.ci.code.BytecodeFrame;
 
@@ -62,7 +61,7 @@
  */
 public class FrameStateAssignmentPhase extends Phase {
 
-    private static class FrameStateAssignmentClosure extends NodeIteratorClosure {
+    private static class FrameStateAssignmentClosure extends ReentrantNodeIterator.NodeIteratorClosure {
 
         @Override
         protected FrameState processNode(FixedNode node, FrameState previousState) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
index 2d770d345500..f6b8ecfde01c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/GuardLoweringPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
@@ -22,32 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.FloatingGuardPhase;
-import org.graalvm.compiler.phases.graph.ScheduledNodeIterator;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
+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 java.util.ListIterator;
 
@@ -123,7 +122,7 @@ public Optional notApplicableTo(GraphState graphState) {
 
     @Override
     protected void run(StructuredGraph graph, CoreProviders context) {
-        SchedulePhase.runWithoutContextOptimizations(graph, SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
+        SchedulePhase.runWithoutContextOptimizations(graph, SchedulePhase.SchedulingStrategy.EARLIEST_WITH_GUARD_ORDER);
         ScheduleResult schedule = graph.getLastSchedule();
 
         for (HIRBlock block : schedule.getCFG().getBlocks()) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/HighTierLoweringPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/HighTierLoweringPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
index e567814f17f3..d8dbb3496e19 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/HighTierLoweringPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 /**
  * A {@link LoweringPhase} used to lower {@link Lowerable} nodes when the graph is in
- * {@link org.graalvm.compiler.nodes.spi.LoweringTool.StandardLoweringStage#HIGH_TIER} stage.
+ * {@link LoweringTool.StandardLoweringStage#HIGH_TIER} stage.
  */
 public class HighTierLoweringPhase extends LoweringPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
index afe20e188451..faa5666af019 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/IncrementalCanonicalizerPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
@@ -22,20 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeWorkList;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
+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;
 
 /**
  * The phase that does the work of {@link CanonicalizerPhase#applyIncremental}. This phase contains
@@ -65,7 +66,7 @@ public boolean checkContract() {
     }
 
     @Override
-    public Optional notApplicableTo(GraphState graphState) {
+    public Optional notApplicableTo(GraphState graphState) {
         GraalError.guarantee(!theTool.finalCanonicalization(), "Final canonicalization must not be incremental");
         return super.notApplicableTo(graphState);
     }
@@ -79,7 +80,7 @@ protected void run(StructuredGraph graph, CoreProviders context) {
     /**
      * Helper class to apply incremental canonicalization using scopes.
      */
-    public static class Apply implements ApplyScope {
+    public static class Apply implements BasePhase.ApplyScope {
         private final EconomicSetNodeEventListener listener;
         private final StructuredGraph graph;
         private final CoreProviders context;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/InsertGuardFencesPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/InsertGuardFencesPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
index 45fa347cced0..75810364a75c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/InsertGuardFencesPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
@@ -22,35 +22,35 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.core.common.SpectrePHTMitigations.NonDeoptGuardTargets;
-import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
-import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTIndexMasking;
+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 java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.extended.MultiGuardNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.phases.Phase;
+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.vm.ci.meta.DeoptimizationReason;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
index 4ec410a8bb12..7349e3271d91 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/IterativeConditionalEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Objects;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
+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;
 
 public class IterativeConditionalEliminationPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LazyValue.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LazyValue.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LazyValue.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LazyValue.java
index f3eff0f2683e..a4a050040d11 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LazyValue.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LazyValue.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.function.Supplier;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
index 714f6c2e294f..59207d4a86b6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LockEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.OSRMonitorEnterNode;
-import org.graalvm.compiler.nodes.java.AccessMonitorNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.MonitorExitNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.Phase;
+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;
 
 public class LockEliminationPhase extends Phase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
index 0bb737e3339c..eace7cd0a7c2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LoopSafepointInsertionPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.core.common.GraalOptions.GenLoopSafepoints;
+import static jdk.compiler.graal.core.common.GraalOptions.GenLoopSafepoints;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
+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;
 
 /**
  * Adds safepoints to loops.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LowTierLoweringPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LowTierLoweringPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
index 84bd62cb6e8f..fa1e2d770756 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LowTierLoweringPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 /**
  * A {@link LoweringPhase} used to lower {@link Lowerable} nodes when the graph is in
- * {@link org.graalvm.compiler.nodes.spi.LoweringTool.StandardLoweringStage#LOW_TIER} stage.
+ * {@link LoweringTool.StandardLoweringStage#LOW_TIER} stage.
  */
 public class LowTierLoweringPhase extends LoweringPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LoweringPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoweringPhase.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LoweringPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoweringPhase.java
index 13952d669789..50867d8d024b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/LoweringPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoweringPhase.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
-
-import static org.graalvm.compiler.core.common.GraalOptions.OptEliminateGuards;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-import static org.graalvm.compiler.nodes.memory.MemoryKill.NO_LOCATION;
-import static org.graalvm.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER;
-import static org.graalvm.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_ENTER_ALWAYS_REACHED;
-import static org.graalvm.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_LEAVE;
-import static org.graalvm.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS;
-import static org.graalvm.compiler.phases.common.LoweringPhase.ProcessBlockState.ST_PROCESS_ALWAYS_REACHED;
+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;
 
 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 org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.Mark;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MemoryMapNode;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SideEffectFreeWriteNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/MidTierLoweringPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/MidTierLoweringPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
index d8a26ea78e08..8aa5dc58ea48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/MidTierLoweringPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 /**
  * A {@link LoweringPhase} used to lower {@link Lowerable} nodes when the graph is in
- * {@link org.graalvm.compiler.nodes.spi.LoweringTool.StandardLoweringStage#MID_TIER} stage.
+ * {@link LoweringTool.StandardLoweringStage#MID_TIER} stage.
  */
 public class MidTierLoweringPhase extends LoweringPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/OptimizeDivPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/OptimizeDivPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
index a04682d9728a..485f1c73625d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/OptimizeDivPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
@@ -22,41 +22,41 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
+import jdk.compiler.graal.phases.BasePhase;
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.IntegerMulHighNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.SignedDivNode;
-import org.graalvm.compiler.nodes.calc.SignedFloatingIntegerDivNode;
-import org.graalvm.compiler.nodes.calc.SignedFloatingIntegerRemNode;
-import org.graalvm.compiler.nodes.calc.SignedRemNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
+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.vm.ci.code.CodeUtil;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/OptimizeExtendsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/OptimizeExtendsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
index 0317c1e20ab0..6ade5edc8c48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/OptimizeExtendsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
@@ -23,41 +23,42 @@
  * questions.
  */
 
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.memory.ExtendableMemoryAccess;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
+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;
 
 /**
  * Goal: minimize the number of {@link ZeroExtendNode}s and {@link SignExtendNode}s needed. This is
  * done by folding extends into memory operations and also by "overextending" extends to cover all
  * given use scenarios. In the case of overextension, an original extend may be replaced with an
  * "extend+narrow" combo. Note that within the backend code generation narrows are free (via
- * {@link org.graalvm.compiler.lir.CastValue}), so it is inconsequential to add more of them. Note
- * that this optimization will always result in the same or fewer number of extends along all paths.
+ * {@link CastValue}), so it is inconsequential to add more of them. Note that this optimization
+ * will always result in the same or fewer number of extends along all paths.
  *
  * The idea case is a situation such as
  *
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/PostRunCanonicalizationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/PostRunCanonicalizationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
index c6bb2fece2b2..1581719ddb98 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/PostRunCanonicalizationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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;
 
 /**
  * The base classes for phases that always want to apply {@link CanonicalizerPhase#applyIncremental}
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
index 0fcb6d699c2a..0c6a7c22cd77 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ProfileCompiledMethodsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import static jdk.vm.ci.services.Services.getSavedProperty;
 
@@ -31,47 +31,47 @@
 import java.util.HashSet;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.calc.ConvertNode;
-import org.graalvm.compiler.nodes.calc.FloatDivNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.NotNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.calc.RemNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.debug.DynamicCounterNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.AccessMonitorNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
+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;
 
 /**
  * This phase add counters for the dynamically executed number of nodes. Incrementing the counter
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
index 98bb5d248366..761845ff4457 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/PropagateDeoptimizeProbabilityPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
+import jdk.compiler.graal.phases.BasePhase;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.graph.NodeStack;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractDeoptimizeNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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;
 
 /**
  * This phase will make sure that the branch leading towards this deopt has 0.0 probability.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/RawConditionalEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/RawConditionalEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
index 846074ca8e61..95f7fbe243d7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/RawConditionalEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
+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;
 
 public class RawConditionalEliminationPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ReassociationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ReassociationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
index c4945d441485..c4946e626a53 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/ReassociationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.EnumSet;
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph.NodeEvent;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
+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.vm.ci.meta.PrimitiveConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
similarity index 70%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
index 39b20f470865..2dbf7d9ffe53 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/RemoveValueProxyPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
@@ -22,20 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.nodes.GraphState.FrameStateVerification.ALL_EXCEPT_LOOP_EXIT;
+import static jdk.compiler.graal.nodes.GraphState.FrameStateVerification.ALL_EXCEPT_LOOP_EXIT;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.FrameStateVerification;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 public class RemoveValueProxyPhase extends PostRunCanonicalizationPhase {
 
@@ -44,13 +45,13 @@ public RemoveValueProxyPhase(CanonicalizerPhase canonicalizer) {
     }
 
     @Override
-    public Optional notApplicableTo(GraphState graphState) {
-        return NotApplicable.ifAny(
+    public Optional notApplicableTo(GraphState graphState) {
+        return BasePhase.NotApplicable.ifAny(
                         super.notApplicableTo(graphState),
-                        NotApplicable.ifApplied(this, StageFlag.VALUE_PROXY_REMOVAL, graphState),
-                        NotApplicable.unlessRunBefore(this, StageFlag.MID_TIER_LOWERING, graphState),
-                        NotApplicable.unlessRunBefore(this, StageFlag.FSA, graphState),
-                        NotApplicable.when(!graphState.canWeakenFrameStateVerification(ALL_EXCEPT_LOOP_EXIT),
+                        BasePhase.NotApplicable.ifApplied(this, StageFlag.VALUE_PROXY_REMOVAL, graphState),
+                        BasePhase.NotApplicable.unlessRunBefore(this, StageFlag.MID_TIER_LOWERING, graphState),
+                        BasePhase.NotApplicable.unlessRunBefore(this, StageFlag.FSA, graphState),
+                        BasePhase.NotApplicable.when(!graphState.canWeakenFrameStateVerification(ALL_EXCEPT_LOOP_EXIT),
                                         "Cannot apply %s because the frame state verification has already been weakened to %s",
                                         getName(), graphState.getFrameStateVerification()));
     }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
index 6eef3eed53af..c8e0cc151b8b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/SnippetFrameStateAssignment.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
@@ -22,32 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.List;
 
+import jdk.compiler.graal.phases.graph.ReentrantNodeIterator;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
+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;
 
 /**
  * Utility class for snippet lowering.
@@ -103,7 +101,7 @@ public enum NodeStateAssignment {
      * side-effecting nodes, decides which state can be used after snippet lowering for a merge or
      * loop exit node.
      */
-    public static class SnippetFrameStateAssignmentClosure extends NodeIteratorClosure {
+    public static class SnippetFrameStateAssignmentClosure extends ReentrantNodeIterator.NodeIteratorClosure {
 
         private final NodeMap stateMapping;
 
@@ -230,7 +228,7 @@ protected NodeStateAssignment afterSplit(AbstractBeginNode node, NodeStateAssign
 
         @Override
         protected EconomicMap processLoop(LoopBeginNode loop, NodeStateAssignment initialState) {
-            LoopInfo loopInfo = ReentrantNodeIterator.processLoop(this, loop, initialState);
+            ReentrantNodeIterator.LoopInfo loopInfo = ReentrantNodeIterator.processLoop(this, loop, initialState);
             int afterCount = 0;
             int invalidCount = 0;
             for (LoopEndNode loopEnd : loop.loopEnds()) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
index 6986568c2407..29a7f8d9e3f6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/UseTrappingNullChecksPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
@@ -22,33 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
-import static org.graalvm.compiler.core.common.GraalOptions.OptImplicitNullChecks;
+import static jdk.compiler.graal.core.common.GraalOptions.OptImplicitNullChecks;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractDeoptimizeNode;
-import org.graalvm.compiler.nodes.CompressionNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.DynamicDeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.NullCheckNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
+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.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
@@ -65,12 +66,12 @@ public static class Options {
     }
 
     @Override
-    public Optional notApplicableTo(GraphState graphState) {
-        return NotApplicable.ifAny(
+    public Optional notApplicableTo(GraphState graphState) {
+        return BasePhase.NotApplicable.ifAny(
                         super.notApplicableTo(graphState),
                         // This phase creates {@link OffsetAddressNode}s that needs to be lowered.
-                        NotApplicable.unlessRunBefore(this, StageFlag.ADDRESS_LOWERING, graphState),
-                        NotApplicable.when(!graphState.getGuardsStage().areFrameStatesAtDeopts(), "This should happen after FSA"));
+                        BasePhase.NotApplicable.unlessRunBefore(this, StageFlag.ADDRESS_LOWERING, graphState),
+                        BasePhase.NotApplicable.when(!graphState.getGuardsStage().areFrameStatesAtDeopts(), "This should happen after FSA"));
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/UseTrappingOperationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/UseTrappingOperationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
index 572a8fda98f9..ff3c68d26934 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/UseTrappingOperationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.List;
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractDeoptimizeNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.DynamicDeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
+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.vm.ci.meta.DeoptimizationReason;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
index e86c673d1761..e05253005319 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/VerifyHeapAtReturnPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.debug.VerifyHeapNode;
-import org.graalvm.compiler.phases.Phase;
+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;
 
 public class VerifyHeapAtReturnPhase extends Phase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
index dbe6651166f2..49df7e5f688e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/WriteBarrierAdditionPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common;
+package jdk.compiler.graal.phases.common;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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;
 
 public class WriteBarrierAdditionPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
index 1d8e140ae11a..5c02377af19e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/InliningPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.inlining;
+package jdk.compiler.graal.phases.common.inlining;
 
 import java.util.LinkedList;
 
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.common.AbstractInliningPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.inlining.policy.InliningPolicy;
-import org.graalvm.compiler.phases.common.inlining.walker.InliningData;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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;
 
 public class InliningPhase extends AbstractInliningPhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
index 08eb2485f63c..c252fcad6946 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/InliningUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.inlining;
+package jdk.compiler.graal.phases.common.inlining;
 
 import static jdk.vm.ci.meta.DeoptimizationAction.InvalidateReprofile;
 import static jdk.vm.ci.meta.DeoptimizationReason.NullCheckException;
-import static org.graalvm.compiler.core.common.GraalOptions.HotSpotPrintInlining;
+import static jdk.compiler.graal.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 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 org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.core.common.util.Util;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Graph.DuplicationReplacement;
-import org.graalvm.compiler.graph.Graph.Mark;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.NodeWorkList;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.DeoptimizingGuard;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.InliningLog;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.MonitorExitNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
-import org.graalvm.compiler.phases.util.ValueMergeUtil;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
-import org.graalvm.compiler.replacements.nodes.ResolvedMethodHandleCallTargetNode;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
index 9852d2096fbf..ff91555822c9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/AbstractInlineInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info;
+package jdk.compiler.graal.phases.common.inlining.info;
 
+import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.common.inlining.info.elem.InlineableGraph;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
index 15cab0f28c5e..6f8e247195e3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/AssumptionInlineInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info;
+package jdk.compiler.graal.phases.common.inlining.info;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.meta.Assumptions.AssumptionResult;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
index 4a1c1ee4cdd9..3e51b460eeeb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/ExactInlineInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info;
+package jdk.compiler.graal.phases.common.inlining.info;
 
+import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
index ee039ecf3e53..d4ca64f517ac 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/InlineInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info;
+package jdk.compiler.graal.phases.common.inlining.info;
 
+import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
index 23d00cd181cb..5a46f7e6b414 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info;
+package jdk.compiler.graal.phases.common.inlining.info;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.InliningLog;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProfileData.SwitchProbabilityData;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.TypeSwitchNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
index f407176b3034..f53a5da06894 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/TypeGuardInlineInfo.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info;
+package jdk.compiler.graal.phases.common.inlining.info;
 
+import jdk.compiler.graal.phases.common.inlining.info.elem.Inlineable;
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
index bfd53bd88e1e..046cc634b2d2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/elem/Inlineable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.info.elem;
+package jdk.compiler.graal.phases.common.inlining.info.elem;
 
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+import jdk.compiler.graal.nodes.Invoke;
+import jdk.compiler.graal.phases.common.CanonicalizerPhase;
+import jdk.compiler.graal.phases.tiers.HighTierContext;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
index cf92c5649f65..12ed998584a8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/info/elem/InlineableGraph.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
@@ -22,30 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.inlining.info.elem;
-
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
+package jdk.compiler.graal.phases.common.inlining.info.elem;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
-import org.graalvm.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.graph.FixedNodeRelativeFrequencyCache;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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.vm.ci.meta.ResolvedJavaMethod;
 
@@ -56,12 +57,12 @@
  * 

  *
  * 

- * Instances of this class don't make sense in isolation but as part of an
- * {@link org.graalvm.compiler.phases.common.inlining.info.InlineInfo InlineInfo}.
+ * Instances of this class don't make sense in isolation but as part of an {@link InlineInfo
+ * InlineInfo}.
  * 

  *
- * @see org.graalvm.compiler.phases.common.inlining.walker.InliningData#moveForward()
- * @see org.graalvm.compiler.phases.common.inlining.walker.CallsiteHolderExplorable
+ * @see InliningData#moveForward()
+ * @see CallsiteHolderExplorable
  */
 public class InlineableGraph implements Inlineable {
 
@@ -204,7 +205,7 @@ private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTie
             }
             assert newGraph.start().next() != null : "graph needs to be populated by the GraphBuilderSuite " + method + ", " + method.canBeInlined();
 
-            new DeadCodeEliminationPhase(Optional).apply(newGraph);
+            new DeadCodeEliminationPhase(DeadCodeEliminationPhase.Optionality.Optional).apply(newGraph);
 
             canonicalizer.apply(newGraph, context);
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
index 932575590ff8..e641b8290210 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/AbstractInliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.policy;
+package jdk.compiler.graal.phases.common.inlining.policy;
 
-import static org.graalvm.compiler.phases.common.inlining.InliningPhase.Options.AlwaysInlineIntrinsics;
+import static jdk.compiler.graal.phases.common.inlining.InliningPhase.Options.AlwaysInlineIntrinsics;
 
 import java.util.Map;
 
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
+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.vm.ci.meta.ProfilingInfo;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
index ea477e79040b..c0621a989a2b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/GreedyInliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.policy;
+package jdk.compiler.graal.phases.common.inlining.policy;
 
-import static org.graalvm.compiler.core.common.GraalOptions.InlineEverything;
-import static org.graalvm.compiler.core.common.GraalOptions.LimitInlinedInvokes;
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumDesiredSize;
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumInliningSize;
-import static org.graalvm.compiler.core.common.GraalOptions.SmallCompiledLowLevelGraphSize;
-import static org.graalvm.compiler.core.common.GraalOptions.TraceInlining;
-import static org.graalvm.compiler.core.common.GraalOptions.TrivialInliningSize;
+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 java.util.Map;
 
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.walker.MethodInvocation;
+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;
 
 public class GreedyInliningPolicy extends AbstractInliningPolicy {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
index 0bdc626fd181..545697eeeaef 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InlineEverythingPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.policy;
+package jdk.compiler.graal.phases.common.inlining.policy;
 
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumDesiredSize;
+import static jdk.compiler.graal.core.common.GraalOptions.MaximumDesiredSize;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.walker.MethodInvocation;
+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;
 
 public class InlineEverythingPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
index 8296c5afa574..2829c0d6b30f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.policy;
+package jdk.compiler.graal.phases.common.inlining.policy;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.walker.MethodInvocation;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
index 3bd1fb8392c8..aa56adf9e73d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/policy/InliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.policy;
+package jdk.compiler.graal.phases.common.inlining.policy;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.walker.MethodInvocation;
+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;
 
 public interface InliningPolicy {
     final class Decision {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
index 842b6725a8c8..3ffb5a984dd8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.walker;
+package jdk.compiler.graal.phases.common.inlining.walker;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
index fc0fbe92c902..ea1c8a169b39 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/CallsiteHolderExplorable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
@@ -22,21 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.inlining.walker;
+package jdk.compiler.graal.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 org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.phases.common.inlining.policy.AbstractInliningPolicy;
-import org.graalvm.compiler.phases.graph.FixedNodeRelativeFrequencyCache;
+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.vm.ci.meta.ResolvedJavaMethod;
 
@@ -47,9 +48,8 @@
  * 

  *
  * 

- * An instance of this class is derived from an
- * {@link org.graalvm.compiler.phases.common.inlining.info.elem.InlineableGraph InlineableGraph} and
- * contains a subset of the information there: just the {@link Invoke} nodes from it. Such nodes are
+ * An instance of this class is derived from an {@link InlineableGraph InlineableGraph} and contains
+ * a subset of the information there: just the {@link Invoke} nodes from it. Such nodes are
  * candidates for depth-first search of further inlining opportunities (thus the adjective
  * "explorable" given to this class)
  * 

@@ -119,7 +119,7 @@ private EconomicSet fixedParamsAt(BitSet freshlyInstantiatedArgum
      *
      * 

      * Constant arguments don't contribute to fixed-params: those params have been removed already,
-     * see {@link org.graalvm.compiler.phases.common.inlining.info.elem.InlineableGraph}.
+     * see {@link InlineableGraph}.
      * 

      *
      * 

diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
index 54cb61ac2a21..200e62b128b6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/ComputeInliningRelevance.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.walker;
+package jdk.compiler.graal.phases.common.inlining.walker;
 
 import java.util.ArrayList;
 import java.util.function.ToDoubleFunction;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeWorkList;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
+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;
 
 public class ComputeInliningRelevance {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
index cbe9f8b00bff..32bbb8609f14 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/InliningData.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.walker;
+package jdk.compiler.graal.phases.common.inlining.walker;
 
-import static org.graalvm.compiler.core.common.GraalOptions.Intrinsify;
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumRecursiveInlining;
-import static org.graalvm.compiler.core.common.GraalOptions.MegamorphicInliningMinMethodProbability;
+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 java.util.ArrayDeque;
 import java.util.ArrayList;
@@ -34,38 +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 org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.info.AssumptionInlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.ExactInlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.MultiTypeGuardInlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.TypeGuardInlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.common.inlining.info.elem.InlineableGraph;
-import org.graalvm.compiler.phases.common.inlining.policy.InliningPolicy;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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.vm.ci.code.BailoutException;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
@@ -89,9 +90,8 @@
  * 

  * The bottom element in the stack consists of:
  * 
    
- * 
  • a single {@link MethodInvocation} (the
- * {@link org.graalvm.compiler.phases.common.inlining.walker.MethodInvocation#isRoot root} one, ie
- * the unknown caller of the root graph)
    • 
+ * 
  • a single {@link MethodInvocation} (the {@link MethodInvocation#isRoot root} one, ie the
+ * unknown caller of the root graph)
    • 
  * 
  • a single {@link CallsiteHolder} (the root one, for the method on which inlining was called)
  * 
    • 
  * 

@@ -512,7 +512,7 @@ private boolean tryToInline(MethodInvocation calleeInvocation, int inliningDepth
      * 

      * The {@link InlineInfo} used to get things rolling is kept around in the
      * {@link MethodInvocation}, it will be needed in case of inlining, see
-     * {@link InlineInfo#inline(org.graalvm.compiler.nodes.spi.CoreProviders, String)}
+     * {@link InlineInfo#inline(CoreProviders, String)}
      * 

      */
     private void processNextInvoke() {
@@ -534,7 +534,7 @@ private void processNextInvoke() {
      * 

      * A freshly instantiated argument is either:
      * 
    
-     * 
  • an {@link InliningData#isFreshInstantiation(org.graalvm.compiler.nodes.ValueNode)}
    • 
+     * 
  • an {@link InliningData#isFreshInstantiation(ValueNode)}
    • 
      * 
  • a fixed-param, ie a {@link ParameterNode} receiving a freshly instantiated argument
    • 
      * 

      * 

diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
index 5a2a02d5b77d..eac0be6238a4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/InliningIterator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases.common.inlining.walker;
+package jdk.compiler.graal.phases.common.inlining.walker;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 import java.util.Iterator;
 import java.util.LinkedList;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+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;
 
 /**
  * Given a graph, visit all fixed nodes in dominator-based order, collecting in the process the
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
index 0328bee01350..996ba3177e75 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/inlining/walker/MethodInvocation.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
@@ -22,15 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.inlining.walker;
+package jdk.compiler.graal.phases.common.inlining.walker;
 
 import java.util.BitSet;
 
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.phases.common.inlining.info.InlineInfo;
-import org.graalvm.compiler.phases.common.inlining.info.elem.Inlineable;
-import org.graalvm.compiler.phases.common.inlining.info.elem.InlineableGraph;
+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.vm.ci.meta.ResolvedJavaMethod;
 
@@ -62,17 +63,16 @@ public class MethodInvocation {
      * 

      * A freshly instantiated argument is either:
      * 
    
-     * 
  • an {@link InliningData#isFreshInstantiation(org.graalvm.compiler.nodes.ValueNode)}
    • 
+     * 
  • an {@link InliningData#isFreshInstantiation(ValueNode)}
    • 
      * 
  • a fixed-param of the graph containing the callsite (ie, of callee.graph()
      * that contains callee.invoke)
    • 
      * 

      * 

      *
      * 

-     * Given those positions, the
-     * {@link org.graalvm.compiler.phases.common.inlining.walker.CallsiteHolderExplorable}
-     * instantiated in {@link #buildCallsiteHolderForElement(int)} can determine which of its
-     * parameters are fixed.
+     * Given those positions, the {@link CallsiteHolderExplorable} instantiated in
+     * {@link #buildCallsiteHolderForElement(int)} can determine which of its parameters are
+     * fixed.
      * 

      */
     private final BitSet freshlyInstantiatedArguments;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/EconomicSetNodeEventListener.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/EconomicSetNodeEventListener.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
index cf5bc21b80c9..793e7f79dcc2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/EconomicSetNodeEventListener.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.util;
+package jdk.compiler.graal.phases.common.util;
 
 import java.util.EnumSet;
 import java.util.Set;
 
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.graph.Graph.NodeEvent;
-import org.graalvm.compiler.graph.Graph.NodeEventListener;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.IndirectCanonicalization;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
+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;
 
 /**
  * A simple {@link NodeEventListener} implementation that accumulates event nodes in a
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/LoopUtility.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/LoopUtility.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
index 59434d6166c3..b5810a3916fd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/LoopUtility.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.util;
+package jdk.compiler.graal.phases.common.util;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Graph.NodeEvent;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.loop.BasicInductionVariable;
-import org.graalvm.compiler.nodes.loop.InductionVariable;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.loop.LoopsData;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+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;
 
 public class LoopUtility {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/OptimizationUtility.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/OptimizationUtility.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
index 15c6f62c4bae..a355cdff2ed5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/common/util/OptimizationUtility.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.common.util;
+package jdk.compiler.graal.phases.common.util;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionKey;
 
 public class OptimizationUtility {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
index 783fcee4a090..22b1c84c41b3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/NodeCostUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.contract;
+package jdk.compiler.graal.phases.contract;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Function;
 
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.GraalGraphError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
index 667471febd74..1029e93e732c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/PhaseSizeContract.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.contract;
+package jdk.compiler.graal.phases.contract;
 
-import org.graalvm.compiler.nodeinfo.NodeSize;
+import jdk.compiler.graal.nodeinfo.NodeSize;
 
 public interface PhaseSizeContract {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
index aafc5e9ec28f..2470aea23f31 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/contract/VerifyNodeCosts.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.contract;
+package jdk.compiler.graal.phases.contract;
 
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Predicate;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.phases.VerifyPhase;
+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;
 
 /**
  * Utility class that verifies that every {@link Class} extending {@link Node} specifies non default
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
index ed1c3df6863f..23de6e9c72ff 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/FixedNodeRelativeFrequencyCache.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.phases.graph;
 
-import static org.graalvm.compiler.nodes.cfg.ControlFlowGraph.multiplyRelativeFrequencies;
+import static jdk.compiler.graal.nodes.cfg.ControlFlowGraph.multiplyRelativeFrequencies;
 
 import java.util.function.ToDoubleFunction;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
+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;
 
 /**
  * Compute relative frequencies for fixed nodes on the fly and cache them at
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/MergeableState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/MergeableState.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/MergeableState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/MergeableState.java
index 0ebaf62679da..e69c291d7543 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/MergeableState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/MergeableState.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.phases.graph;
 
 import java.util.List;
 
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
+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;
 
 public abstract class MergeableState {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
index 495b87fab223..34c3afc21a96 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/PostOrderNodeIterator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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;
 
 /**
  * A PostOrderNodeIterator iterates the fixed nodes of the graph in post order starting from a
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
index dfcf8437d153..82ab542a89b1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ReentrantBlockIterator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
+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;
 
 public final class ReentrantBlockIterator {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
index b561c910030c..e6f1709ac3af 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ReentrantNodeIterator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
+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;
 
 public final class ReentrantNodeIterator {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
index aa9295e9fe4f..1166e9d900f5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/ScheduledNodeIterator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.phases.graph;
 
 import java.util.ListIterator;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
+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;
 
 /**
  * Iterates over a list of nodes, which usually comes from
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
index 88a6d8a773df..6b2354050685 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/StatelessPostOrderNodeIterator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.phases.graph;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
+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;
 
 /**
  * This iterator implements a reverse post order iteration over the fixed nodes in the graph,
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/package-info.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/package-info.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/package-info.java
index 09d58e5522df..30984bebabd4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/graph/package-info.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/package-info.java
@@ -26,4 +26,4 @@
 /**
  *
  */
-package org.graalvm.compiler.phases.graph;
+package jdk.compiler.graal.phases.graph;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/package-info.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/package-info.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/package-info.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/package-info.java
index 56f0385b3185..572c279deba0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/package-info.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 org.graalvm.compiler.phases;
+package jdk.compiler.graal.phases;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/BlockClosure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/BlockClosure.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
index b6f25eec2390..77136ac4e7b1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/BlockClosure.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.schedule;
+package jdk.compiler.graal.phases.schedule;
 
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
+import jdk.compiler.graal.nodes.cfg.HIRBlock;
 
 /**
  * The {@code BlockClosure} interface represents a closure for iterating over blocks.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
index 135d1a02116e..3a1545e228a6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/SchedulePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.schedule;
+package jdk.compiler.graal.phases.schedule;
 
 import static org.graalvm.collections.Equivalence.IDENTITY;
-import static org.graalvm.compiler.core.common.GraalOptions.GuardPriorities;
-import static org.graalvm.compiler.core.common.GraalOptions.OptScheduleOutOfLoops;
+import static jdk.compiler.graal.core.common.GraalOptions.GuardPriorities;
+import static jdk.compiler.graal.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 org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph.NodeEvent;
-import org.graalvm.compiler.graph.Graph.NodeEventListener;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeStack;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StaticDeoptimizingNode;
-import org.graalvm.compiler.nodes.StaticDeoptimizingNode.GuardPriority;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.calc.ConvertNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.HIRLoop;
-import org.graalvm.compiler.nodes.cfg.LocationSet;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
+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 org.graalvm.word.LocationIdentity;
 
 public final class SchedulePhase extends BasePhase {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/ScheduleVerification.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/ScheduleVerification.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
index c4f7a0589ceb..2902d35436e5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/schedule/ScheduleVerification.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
@@ -22,42 +22,41 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.schedule;
+package jdk.compiler.graal.phases.schedule;
 
 import java.util.ArrayDeque;
 import java.util.List;
 
+import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MemoryProxyNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.HIRLoop;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
+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 org.graalvm.word.LocationIdentity;
 
 /**
@@ -65,7 +64,7 @@
  * between definition and usage. Also checks that there are no usages spanning loop exits without a
  * proper proxy node.
  */
-public final class ScheduleVerification extends BlockIteratorClosure> {
+public final class ScheduleVerification extends ReentrantBlockIterator.BlockIteratorClosure> {
 
     private final BlockMap> blockToNodesMap;
     private final NodeMap nodeMap;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
index 8f7dcd596ae6..0d779ae73ef9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/CompilerConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
-
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase.FinalCodeAnalysisContext;
-import org.graalvm.compiler.lir.phases.LIRPhaseSuite;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
+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;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/HighTierContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/HighTierContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
index a0b99a6bc3c8..fe1d9ae065fd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/HighTierContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.util.Providers;
+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;
 
 public class HighTierContext extends CoreProvidersDelegate {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/LowTierContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/LowTierContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
index 1e51007e4053..accab500cf66 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/LowTierContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
+import jdk.compiler.graal.phases.util.Providers;
 
 import jdk.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/MidTierContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/MidTierContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
index 0b3664659a2f..337ea2564a78 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/MidTierContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.nodes.spi.CoreProvidersDelegate;
+import jdk.compiler.graal.phases.OptimisticOptimizations;
+import jdk.compiler.graal.phases.util.Providers;
 
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.ProfilingInfo;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/Suites.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/Suites.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/Suites.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/Suites.java
index 7f28909686a2..fa791a710e2f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/Suites.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/Suites.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
-import org.graalvm.compiler.lir.alloc.RegisterAllocationPhase;
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
-import org.graalvm.compiler.lir.phases.LIRPhase;
-import org.graalvm.compiler.lir.phases.LIRPhaseSuite;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
+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.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
index d060ae138f12..24065b7ee34e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/SuitesCreator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.lir.phases.LIRSuites;
+import jdk.compiler.graal.options.OptionValues;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
index 3ffb32abaaf5..32294baadadf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/SuitesProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
+import jdk.compiler.graal.lir.phases.LIRSuites;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.phases.PhaseSuite;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/TargetProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/TargetProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
index c6ecf39efeb1..d5b42d281972 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/tiers/TargetProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.tiers;
+package jdk.compiler.graal.phases.tiers;
 
 import jdk.vm.ci.code.TargetDescription;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/GraphOrder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/GraphOrder.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/GraphOrder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/GraphOrder.java
index 7c9afeaef7e6..cd404432e827 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/GraphOrder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/GraphOrder.java
@@ -22,46 +22,45 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.util;
+package jdk.compiler.graal.phases.util;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import jdk.compiler.graal.phases.graph.ReentrantBlockIterator;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.GraalGraphError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
-import org.graalvm.compiler.phases.graph.StatelessPostOrderNodeIterator;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
+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;
 
 public final class GraphOrder {
 
@@ -176,7 +175,7 @@ private static boolean assertScheduleableBeforeFSA(final StructuredGraph graph)
             final EconomicMap loopEntryStates = EconomicMap.create(Equivalence.IDENTITY);
             final ScheduleResult schedule = graph.getLastSchedule();
 
-            BlockIteratorClosure closure = new BlockIteratorClosure<>() {
+            ReentrantBlockIterator.BlockIteratorClosure closure = new ReentrantBlockIterator.BlockIteratorClosure<>() {
 
                 @Override
                 protected NodeBitMap processBlock(final HIRBlock block, final NodeBitMap currentState) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/Providers.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/Providers.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/Providers.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/Providers.java
index b8b544031f83..7962b685152b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/Providers.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/Providers.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.util;
-
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.nodes.spi.WordVerification;
-import org.graalvm.compiler.word.WordTypes;
-import org.graalvm.compiler.word.WordVerificationImpl;
+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;
 
 import jdk.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
index 9641acc95a9a..fd037e83461c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/phases/util/ValueMergeUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.phases.util;
+package jdk.compiler.graal.phases.util;
 
 import java.util.List;
 import java.util.function.Function;
 
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
+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;
 
 public class ValueMergeUtil {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/BciBlockMappingDumpHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/BciBlockMappingDumpHandler.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
index 45856ecc2faf..dab491c2b549 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/BciBlockMappingDumpHandler.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
 import java.io.IOException;
 import java.util.ArrayDeque;
@@ -32,20 +32,20 @@
 import java.util.HashSet;
 import java.util.Map;
 
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.java.BciBlockMapping;
-import org.graalvm.compiler.java.BciBlockMapping.BciBlock;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.graphio.GraphElements;
-import org.graalvm.graphio.GraphOutput;
-import org.graalvm.graphio.GraphOutput.Builder;
-import org.graalvm.graphio.GraphStructure;
-import org.graalvm.graphio.GraphTypes;
+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.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
index 9f87e40b863c..19d686eba22e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/BinaryGraphPrinter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
-import static org.graalvm.compiler.graph.Edges.Type.Inputs;
-import static org.graalvm.compiler.graph.Edges.Type.Successors;
+import static jdk.compiler.graal.graph.Edges.Type.Inputs;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.InputEdges;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.SourceLanguagePosition;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.util.JavaConstantFormattable;
-import org.graalvm.graphio.GraphBlocks;
-import org.graalvm.graphio.GraphElements;
-import org.graalvm.graphio.GraphLocations;
-import org.graalvm.graphio.GraphOutput;
-import org.graalvm.graphio.GraphStructure;
-import org.graalvm.graphio.GraphTypes;
+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.vm.ci.meta.JavaType;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CFGPrinter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinter.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CFGPrinter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinter.java
index d5242ceadf10..568a4d270117 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CFGPrinter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinter.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
 import static java.lang.Character.toLowerCase;
-import static org.graalvm.compiler.core.match.ComplexMatchValue.INTERIOR_MATCH;
+import static jdk.compiler.graal.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 org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.BytecodeDisassembler;
-import org.graalvm.compiler.core.common.cfg.AbstractControlFlowGraph;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.gen.NodeLIRBuilder;
-import org.graalvm.compiler.core.match.ComplexMatchValue;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.debug.IntervalDumper;
-import org.graalvm.compiler.lir.debug.IntervalDumper.IntervalVisitor;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
+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.vm.ci.code.DebugInfo;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CFGPrinterObserver.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CFGPrinterObserver.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
index dac77a74c197..f724d9b06b5e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CFGPrinterObserver.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
-import static org.graalvm.compiler.debug.DebugOptions.PrintBackendCFG;
+import static jdk.compiler.graal.debug.DebugOptions.PrintBackendCFG;
 
 import java.io.BufferedOutputStream;
 import java.io.IOException;
@@ -33,25 +33,25 @@
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.DisassemblerProvider;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.gen.NodeLIRBuilder;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.DebugDumpScope;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.PathUtilities;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.debug.IntervalDumper;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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.vm.ci.code.CodeCacheProvider;
 import jdk.vm.ci.code.InstalledCode;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
index 784ec8c7fea8..646756e0a6ad 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CanonicalStringGraphPrinter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
-import static org.graalvm.compiler.debug.DebugOptions.CanonicalGraphStringsCheckConstants;
-import static org.graalvm.compiler.debug.DebugOptions.CanonicalGraphStringsExcludeVirtuals;
-import static org.graalvm.compiler.debug.DebugOptions.CanonicalGraphStringsRemoveIdentities;
-import static org.graalvm.compiler.debug.DebugOptions.PrintCanonicalGraphStringFlavor;
+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 java.io.BufferedWriter;
 import java.io.IOException;
@@ -41,28 +41,28 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.Fields;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.PathUtilities;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CompilationPrinter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CompilationPrinter.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CompilationPrinter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CompilationPrinter.java
index 57d7d066c341..7a8c9a5b1eb0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/CompilationPrinter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CompilationPrinter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
 import java.io.Closeable;
 import java.io.OutputStream;
@@ -30,9 +30,9 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.LogStream;
-import org.graalvm.compiler.lir.util.IndexedValueMap;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.compiler.graal.debug.LogStream;
+import jdk.compiler.graal.lir.util.IndexedValueMap;
 
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.BytecodePosition;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
index b4d0c4ffd812..436bb867b2df 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraalDebugHandlersFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.DebugHandler;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+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;
 
 @ServiceProvider(DebugHandlersFactory.class)
 public class GraalDebugHandlersFactory implements DebugHandlersFactory {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraphPrinter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinter.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraphPrinter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinter.java
index b6f7d2ad19d5..2277df8de3b1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraphPrinter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
 import java.io.Closeable;
 import java.io.IOException;
@@ -34,15 +34,15 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Scope;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.util.JavaConstantFormatter;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
index fa490b6abef2..445e1272da15 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/GraphPrinterDumpHandler.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
-import static org.graalvm.compiler.debug.DebugConfig.asJavaMethod;
-import static org.graalvm.compiler.debug.DebugOptions.PrintUnmodifiedGraphs;
+import static jdk.compiler.graal.debug.DebugConfig.asJavaMethod;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.DebugDumpScope;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
index b1cda223304f..8f1cd020358d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/printer/NoDeadCodeVerifyHandler.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.printer;
+package jdk.compiler.graal.printer;
 
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugVerifyHandler;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
+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;
 
 /**
  * Verifies that graphs have no dead code.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/AllocationSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/AllocationSnippets.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/AllocationSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/AllocationSnippets.java
index 805f9178d74c..c48d503ad036 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/AllocationSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/AllocationSnippets.java
@@ -22,23 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
-
-import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.ReplacementsUtil.REPLACEMENTS_ASSERTIONS_ENABLED;
-import static org.graalvm.compiler.replacements.nodes.ExplodeLoopNode.explodeLoop;
-
-import org.graalvm.compiler.nodes.PrefetchAllocateNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.replacements.SnippetCounter.Group;
-import org.graalvm.compiler.replacements.nodes.ExplodeLoopNode;
-import org.graalvm.compiler.replacements.nodes.ZeroMemoryNode;
-import org.graalvm.compiler.word.Word;
+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;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.UnsignedWord;
 import org.graalvm.word.WordFactory;
@@ -306,7 +305,7 @@ private void fillContents(Word memory, FillContent fillContents, int startOffset
                     boolean supportsOptimizedFilling, AllocationSnippetCounters snippetCounters) {
         if (fillContents == FillContent.WITH_ZEROES) {
             zeroMemory(memory, startOffset, endOffset, isEndOffsetConstant, maybeUnroll, supportsBulkZeroing, supportsOptimizedFilling, snippetCounters);
-        } else if (REPLACEMENTS_ASSERTIONS_ENABLED && fillContents == FillContent.WITH_GARBAGE_IF_ASSERTIONS_ENABLED) {
+        } else if (ReplacementsUtil.REPLACEMENTS_ASSERTIONS_ENABLED && fillContents == FillContent.WITH_GARBAGE_IF_ASSERTIONS_ENABLED) {
             fillWithGarbage(memory, startOffset, endOffset, isEndOffsetConstant, maybeUnroll, supportsOptimizedFilling, snippetCounters);
         }
     }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/BigIntegerSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/BigIntegerSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
index deaab913d7e9..326f909846a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/BigIntegerSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
-import org.graalvm.compiler.word.Word;
+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 org.graalvm.word.WordFactory;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/BoxingSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BoxingSnippets.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/BoxingSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BoxingSnippets.java
index 95fb304011ae..4a3bcdce0cba 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/BoxingSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BoxingSnippets.java
@@ -22,29 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
-
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+package jdk.compiler.graal.replacements;
 
 import java.util.EnumMap;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.extended.AbstractBoxingNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.UnboxNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetCounter.Group;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -148,16 +142,16 @@ public static short shortValue(Short value, @ConstantParameter SnippetCounter va
         return value.shortValue();
     }
 
-    public static final class Templates extends AbstractTemplates {
+    public static final class Templates extends SnippetTemplate.AbstractTemplates {
 
-        private final EnumMap boxSnippets = new EnumMap<>(JavaKind.class);
-        private final EnumMap unboxSnippets = new EnumMap<>(JavaKind.class);
+        private final EnumMap boxSnippets = new EnumMap<>(JavaKind.class);
+        private final EnumMap unboxSnippets = new EnumMap<>(JavaKind.class);
 
         private final SnippetCounter valueOfCounter;
         private final SnippetCounter valueCounter;
 
         @SuppressWarnings("hiding")
-        public Templates(OptionValues options, Group.Factory factory, Providers providers) {
+        public Templates(OptionValues options, SnippetCounter.Group.Factory factory, Providers providers) {
             super(options, providers);
 
             for (JavaKind kind : new JavaKind[]{JavaKind.Boolean, JavaKind.Byte, JavaKind.Char, JavaKind.Double, JavaKind.Float, JavaKind.Int, JavaKind.Long, JavaKind.Short}) {
@@ -225,7 +219,7 @@ public Templates(OptionValues options, Group.Factory factory, Providers provider
                                 kind.getJavaName() + "Value",
                                 accessedLocation));
             }
-            Group group = factory.createSnippetCounterGroup("Boxing");
+            SnippetCounter.Group group = factory.createSnippetCounterGroup("Boxing");
             valueOfCounter = new SnippetCounter(group, "valueOf", "box intrinsification");
             valueCounter = new SnippetCounter(group, "Value", "unbox intrinsification");
         }
@@ -254,23 +248,23 @@ private static LocationIdentity getCacheLocation(CoreProviders providers, JavaKi
         }
 
         public void lower(BoxNode box, LoweringTool tool) {
-            Arguments args = null;
-            args = new Arguments(boxSnippets.get(box.getBoxingKind()), box.graph().getGuardsStage(), tool.getLoweringStage());
+            SnippetTemplate.Arguments args = null;
+            args = new SnippetTemplate.Arguments(boxSnippets.get(box.getBoxingKind()), box.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("value", box.getValue());
             args.addConst("valueOfCounter", valueOfCounter);
             SnippetTemplate template = template(tool, box, args);
             box.getDebug().log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", box.graph(), box, template, args);
-            template.instantiate(tool.getMetaAccess(), box, DEFAULT_REPLACER, args);
+            template.instantiate(tool.getMetaAccess(), box, SnippetTemplate.DEFAULT_REPLACER, args);
         }
 
         public void lower(UnboxNode unbox, LoweringTool tool) {
-            Arguments args = new Arguments(unboxSnippets.get(unbox.getBoxingKind()), unbox.graph().getGuardsStage(), tool.getLoweringStage());
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(unboxSnippets.get(unbox.getBoxingKind()), unbox.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("value", unbox.getValue());
             args.addConst("valueCounter", valueCounter);
 
             SnippetTemplate template = template(tool, unbox, args);
             unbox.getDebug().log("Lowering integerValueOf in %s: node=%s, template=%s, arguments=%s", unbox.graph(), unbox, template, args);
-            template.instantiate(tool.getMetaAccess(), unbox, DEFAULT_REPLACER, args);
+            template.instantiate(tool.getMetaAccess(), unbox, SnippetTemplate.DEFAULT_REPLACER, args);
         }
     }
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
index 10f70ddf227f..7c4b9b36d446 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/CachingPEGraphDecoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.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 org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DominatorBasedGlobalValueNumberingPhase;
-import org.graalvm.compiler.phases.util.Providers;
+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.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
index 495c21c43ee6..0f0a326fba71 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ConstantBindingParameterPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.DataPointerConstant;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
index f79d8a59a38a..0d94c1d94f36 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/DefaultJavaLoweringProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
@@ -22,146 +22,146 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions.EmitStringSubstitutions;
-import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTIndexMasking;
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.branchlessMax;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.branchlessMin;
-import static org.graalvm.compiler.nodes.java.ArrayLengthNode.readArrayLength;
+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 java.nio.ByteOrder;
 import java.util.ArrayList;
 import java.util.BitSet;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.CompressionNode.CompressionOp;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GetObjectAddressNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatingIntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.SignedDivNode;
-import org.graalvm.compiler.nodes.calc.SignedFloatingIntegerDivNode;
-import org.graalvm.compiler.nodes.calc.SignedFloatingIntegerRemNode;
-import org.graalvm.compiler.nodes.calc.SignedRemNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.calc.UnpackEndianHalfNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.debug.VerifyHeapNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.ClassIsArrayNode;
-import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.extended.JavaWriteNode;
-import org.graalvm.compiler.nodes.extended.LoadArrayComponentHubNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.LoadHubOrNullNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.extended.MembarNode.FenceKind;
-import org.graalvm.compiler.nodes.extended.ObjectIsArrayNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.extended.UnboxNode;
-import org.graalvm.compiler.nodes.extended.UnsafeMemoryLoadNode;
-import org.graalvm.compiler.nodes.extended.UnsafeMemoryStoreNode;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.AccessIndexedNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode;
-import org.graalvm.compiler.nodes.java.AtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndAddNode;
-import org.graalvm.compiler.nodes.java.LoweredAtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.RegisterFinalizerNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.SideEffectFreeWriteNode;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.IdentityHashCodeNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.CodeUtil;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/DimensionsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DimensionsNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/DimensionsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DimensionsNode.java
index 50cb84d50ce0..72ba34798fb8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/DimensionsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DimensionsNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.word.Word;
-import org.graalvm.compiler.word.WordTypes;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/GraphKit.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/GraphKit.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/GraphKit.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/GraphKit.java
index 59299184997e..847fbdfd13c2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/GraphKit.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/GraphKit.java
@@ -22,60 +22,60 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import static jdk.vm.ci.code.BytecodeFrame.UNKNOWN_BCI;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static org.graalvm.compiler.nodes.CallTargetNode.InvokeKind.Static;
+import static jdk.compiler.graal.nodes.CallTargetNode.InvokeKind.Static;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ValueNumberable;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.word.WordTypes;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IdentityHashCodeSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IdentityHashCodeSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
index a3b3145c238c..10f19c45fe7c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IdentityHashCodeSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.nodes.IdentityHashCodeNode;
+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 org.graalvm.word.LocationIdentity;
 
 public abstract class IdentityHashCodeSnippets implements Snippets {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
index a0051d0a17fc..ea6c7fc4ad4f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InlineDuringParsingPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.core.common.GraalOptions.TrivialInliningSize;
-import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsing;
-import static org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
-import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+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 org.graalvm.compiler.java.BytecodeParserOptions;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+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.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.services.Services;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
index 1d13d041a8b3..6c0a67619b5f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InstanceOfSnippetsTemplates.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
@@ -22,37 +22,37 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodes.calc.CompareNode.createCompareNode;
+import static jdk.compiler.graal.nodes.calc.CompareNode.createCompareNode;
 
 import java.util.List;
 
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ConditionAnchorNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ShortCircuitOrNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.UsageReplacer;
+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;
 
 /**
  * Helper class for lowering {@link InstanceOfNode}s with snippets. The majority of the complexity
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
index 8030591a459f..1bcb8aecbaf6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IntrinsicGraphBuilder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
@@ -22,50 +22,50 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import static jdk.vm.ci.code.BytecodeFrame.AFTER_BCI;
 
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invokable;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.code.BailoutException;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
index 396f81bd0b41..3a0a65844e7b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/InvocationPluginHelper.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
@@ -22,60 +22,60 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 
 import java.util.ArrayList;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicNegationNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProfileData;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.calc.OrNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode;
-import org.graalvm.compiler.nodes.calc.XorNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.word.Word;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IsArraySnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IsArraySnippets.java
similarity index 71%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IsArraySnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IsArraySnippets.java
index bcfebdb5c77e..5c7af785dd6f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/IsArraySnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IsArraySnippets.java
@@ -22,20 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.unknownProbability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.unknownProbability;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ClassIsArrayNode;
-import org.graalvm.compiler.nodes.extended.ObjectIsArrayNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
+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;
 
 public abstract class IsArraySnippets implements Snippets {
 
@@ -52,8 +50,8 @@ Object classIsArraySnippet(@Snippet.NonNullParameter Class clazz, Object true
     protected abstract boolean classIsArray(Class clazz);
 
     public static class Templates extends InstanceOfSnippetsTemplates {
-        private final SnippetInfo objectIsArraySnippet;
-        private final SnippetInfo classIsArraySnippet;
+        private final SnippetTemplate.SnippetInfo objectIsArraySnippet;
+        private final SnippetTemplate.SnippetInfo classIsArraySnippet;
 
         @SuppressWarnings("this-escape")
         public Templates(IsArraySnippets receiver, OptionValues options, Providers providers) {
@@ -63,14 +61,14 @@ public Templates(IsArraySnippets receiver, OptionValues options, Providers provi
         }
 
         @Override
-        protected Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool tool) {
+        protected SnippetTemplate.Arguments makeArguments(InstanceOfUsageReplacer replacer, LoweringTool tool) {
             ValueNode node = replacer.instanceOf;
-            Arguments args;
+            SnippetTemplate.Arguments args;
             if (node instanceof ObjectIsArrayNode) {
-                args = new Arguments(objectIsArraySnippet, node.graph().getGuardsStage(), tool.getLoweringStage());
+                args = new SnippetTemplate.Arguments(objectIsArraySnippet, node.graph().getGuardsStage(), tool.getLoweringStage());
                 args.add("object", ((ObjectIsArrayNode) node).getValue());
             } else if (replacer.instanceOf instanceof ClassIsArrayNode) {
-                args = new Arguments(classIsArraySnippet, node.graph().getGuardsStage(), tool.getLoweringStage());
+                args = new SnippetTemplate.Arguments(classIsArraySnippet, node.graph().getGuardsStage(), tool.getLoweringStage());
                 args.add("clazz", ((ClassIsArrayNode) node).getValue());
             } else {
                 throw GraalError.shouldNotReachHere(node + " " + replacer); // ExcludeFromJacocoGeneratedReport
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/JavacBug.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/JavacBug.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/JavacBug.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/JavacBug.java
index 431644473b4b..9faf85097933 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/JavacBug.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/JavacBug.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 /**
  * Used to indicate that an otherwise strange looking code pattern is required to work around a bug
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
index 5352c4e2c073..508d81a6d358 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/MethodHandlePlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
@@ -22,26 +22,26 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumRecursiveInlining;
+import static jdk.compiler.graal.core.common.GraalOptions.MaximumRecursiveInlining;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.Invokable;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
-import org.graalvm.compiler.replacements.nodes.MacroNode;
-import org.graalvm.compiler.replacements.nodes.MethodHandleNode;
-import org.graalvm.compiler.replacements.nodes.ResolvedMethodHandleCallTargetNode;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MethodHandleAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/MethodHandleWithExceptionPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/MethodHandleWithExceptionPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
index af8250416375..c4ba6b68f74e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/MethodHandleWithExceptionPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
-import org.graalvm.compiler.replacements.nodes.MacroNode;
-import org.graalvm.compiler.replacements.nodes.MethodHandleWithExceptionNode;
+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.vm.ci.meta.MethodHandleAccessProvider;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
index aa76b8322091..1433433a7ee4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NodeIntrinsificationProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginInjectionProvider;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
-import org.graalvm.compiler.word.WordTypes;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NodeStrideUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NodeStrideUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
index fd18cc36ed2f..e91118a9d58f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NodeStrideUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.StrideUtil;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * This class provides utility methods for "stride-agnostic" intrinsic nodes such as
- * {@link org.graalvm.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 into one as follows: {@code (strideA * N_STRIDES) + strideB}. This value is used inside
- * the intrinsic as a jump table index to dispatch to separately compiled versions for each possible
- * combination of strides.
+ * {@link 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 into one as follows:
+ * {@code (strideA * N_STRIDES) + strideB}. This value is used inside the intrinsic as a jump table
+ * index to dispatch to separately compiled versions for each possible combination of strides.
  */
 public final class NodeStrideUtil {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NonNullParameterPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NonNullParameterPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
index 326c2d301837..b6014030576a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/NonNullParameterPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
@@ -22,22 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import java.util.BitSet;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
+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;
 
 /**
  * A {@link ParameterPlugin} that sets non-null stamps for parameters annotated with
- * {@link org.graalvm.compiler.api.replacements.Snippet.NonNullParameter}.
+ * {@link Snippet.NonNullParameter}.
  */
 public class NonNullParameterPlugin implements ParameterPlugin {
     private final BitSet nonNullParameters;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/PEGraphDecoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
index d6b0891525c6..73ec2e5b5284 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/PEGraphDecoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.debug.GraalError.unimplemented;
-import static org.graalvm.compiler.debug.GraalError.unimplementedOverride;
-import static org.graalvm.compiler.nodeinfo.InputType.Anchor;
-import static org.graalvm.compiler.nodeinfo.InputType.Guard;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+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 java.net.URI;
 import java.util.ArrayList;
@@ -43,97 +43,97 @@
 import java.util.concurrent.ConcurrentHashMap;
 
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.cfg.CFGVerifier;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.SourceLanguagePosition;
-import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeoptBciSupplier;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invokable;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PluginReplacementInterface;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.SimplifyingGraphDecoder;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.IntegerSwitchNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.InvocationPluginReceiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
+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.vm.ci.code.Architecture;
 import jdk.vm.ci.code.BailoutException;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/PartialIntrinsicCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/PartialIntrinsicCallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
index 6d5fc689b4f6..032b566b6dff 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/PartialIntrinsicCallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
index 7f7fea95e2d6..a049c005cacf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions.UseSnippetGraphCache;
-import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets;
-import static org.graalvm.compiler.debug.DebugOptions.DumpOnError;
-import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
-import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
+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 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.api.replacements.SnippetTemplateCache;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugContext.Description;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.GraphBuilderPhase.Instance;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.SnippetParameterInfo;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
-import org.graalvm.compiler.word.Word;
-import org.graalvm.compiler.word.WordOperationPlugin;
-import org.graalvm.compiler.word.WordTypes;
+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.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.JavaKind;
@@ -353,9 +353,7 @@ public StructuredGraph getInlineSubstitution(ResolvedJavaMethod method, int invo
      * @param nonNullParameters
      * @param original XXX always null?
      * @param trackNodeSourcePosition record source information
-     * @param context
-     *            {@link org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext
-     *            compilation context} for the graph
+     * @param context {@link IntrinsicContext.CompilationContext compilation context} for the graph
      */
     public StructuredGraph makeGraph(DebugContext debug, BytecodeProvider bytecodeProvider, ResolvedJavaMethod method, Object[] args, BitSet nonNullParameters, ResolvedJavaMethod original,
                     boolean trackNodeSourcePosition, NodeSourcePosition replaceePosition, IntrinsicContext.CompilationContext context) {
@@ -364,8 +362,7 @@ public StructuredGraph makeGraph(DebugContext debug, BytecodeProvider bytecodePr
 
     /**
      * Creates a preprocessed graph for a snippet or method substitution with a context of .
-     * {@link org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext#INLINE_AFTER_PARSING}
-     * .
+     * {@link IntrinsicContext.CompilationContext#INLINE_AFTER_PARSING} .
      *
      * @param bytecodeProvider how to access the bytecode of {@code method}
      * @param method the snippet or method substitution for which a graph will be created
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
index 99f71639114e..fcd47df6bc46 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/ReplacementsUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetCounter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounter.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetCounter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounter.java
index 2637012f3e03..ff520b586495 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetCounter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounter.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.GraalOptions;
+import jdk.compiler.graal.core.common.GraalOptions;
 
 /**
  * A counter that can (only) be {@linkplain #inc() incremented} from within a snippet for gathering
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetCounterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetCounterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
index 84dc2e3286c1..151ca6c2a007 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetCounterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+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 java.util.Arrays;
 
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
-import org.graalvm.compiler.word.ObjectAccess;
+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 org.graalvm.word.LocationIdentity;
 
 import sun.misc.Unsafe;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetIntegerHistogram.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetIntegerHistogram.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
index 11ad63ef7b58..c9db6853f719 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetIntegerHistogram.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 /**
  * A histogram that can (only) be {@linkplain #inc(long) incremented} from within a snippet for
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetSubstitutionInvocationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetSubstitutionInvocationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
index 77bbb86b8a00..b7b6ddf8e782 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetSubstitutionInvocationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
@@ -23,17 +23,17 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import java.lang.reflect.Type;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.replacements.nodes.MacroNode;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetSubstitutionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetSubstitutionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
index 09a8c73c40d2..bc7df71841e1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetSubstitutionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_IGNORED;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_IGNORED;
 
+import jdk.compiler.graal.replacements.nodes.MacroNode;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.replacements.nodes.FallbackInvokeWithExceptionNode;
-import org.graalvm.compiler.replacements.nodes.MacroNode;
-import org.graalvm.compiler.replacements.nodes.MacroWithExceptionNode;
+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;
 
 /**
  * A node that lowers a non-side effecting snippet.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetTemplate.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetTemplate.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetTemplate.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetTemplate.java
index 4e511c6770ea..f20c48c8eee4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/SnippetTemplate.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetTemplate.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 import static java.util.FormattableFlags.ALTERNATE;
 import static jdk.vm.ci.services.Services.IS_IN_NATIVE_IMAGE;
-import static org.graalvm.compiler.debug.DebugContext.applyFormattingFlagsAndWidth;
-import static org.graalvm.compiler.debug.DebugOptions.DumpOnError;
-import static org.graalvm.compiler.graph.iterators.NodePredicates.isNotA;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
+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 org.graalvm.word.LocationIdentity.any;
 
 import java.lang.reflect.Array;
@@ -49,140 +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 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.graph.Graph.Mark;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.loop.phases.LoopTransformations;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.DeoptBciSupplier;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.InliningLog;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.MemoryMapControlSinkNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode.Placeholder;
-import org.graalvm.compiler.nodes.PiNode.PlaceholderStamp;
-import org.graalvm.compiler.nodes.ProfileData;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.VirtualState.NodePositionClosure;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.AbstractBoxingNode;
-import org.graalvm.compiler.nodes.extended.CaptureStateBeginNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryAnchorNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MemoryMap;
-import org.graalvm.compiler.nodes.memory.MemoryMapNode;
-import org.graalvm.compiler.nodes.memory.MemoryPhiNode;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.MemoryEdgeProxy;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.spi.SnippetParameterInfo;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
-import org.graalvm.compiler.phases.common.FloatingReadPhase;
-import org.graalvm.compiler.phases.common.FloatingReadPhase.MemoryMapImpl;
-import org.graalvm.compiler.phases.common.GuardLoweringPhase;
-import org.graalvm.compiler.phases.common.HighTierLoweringPhase;
-import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
-import org.graalvm.compiler.phases.common.LowTierLoweringPhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.common.MidTierLoweringPhase;
-import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
-import org.graalvm.compiler.phases.common.SnippetFrameStateAssignment;
-import org.graalvm.compiler.phases.common.SnippetFrameStateAssignment.NodeStateAssignment;
-import org.graalvm.compiler.phases.common.SnippetFrameStateAssignment.SnippetFrameStateAssignmentClosure;
-import org.graalvm.compiler.phases.common.WriteBarrierAdditionPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.CStringConstant;
-import org.graalvm.compiler.replacements.nodes.ExplodeLoopNode;
-import org.graalvm.compiler.replacements.nodes.FallbackInvokeWithExceptionNode;
-import org.graalvm.compiler.replacements.nodes.LoadSnippetVarargParameterNode;
-import org.graalvm.compiler.replacements.nodes.MacroWithExceptionNode;
-import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
-import org.graalvm.util.CollectionsUtil;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordBase;
 
@@ -281,7 +284,7 @@
  * It is important to note that we do not yet remove the original {@code Begin} and
  * {@code WithException} node, although they are no longer needed. Doing so would require support
  * from the {@link LoweringPhase}, which might still hold references to these nodes for subsequent
- * lowering rounds. {@linkplain org.graalvm.compiler.nodes.BeginNode#simplify Simplifications} and
+ * lowering rounds. {@linkplain BeginNode#simplify Simplifications} and
  * {@linkplain ExceptionObjectNode#lower lowering} will take care of removing these nodes.
  *
  * 
Replacee Graph after lowering

@@ -310,9 +313,9 @@
  *
  * {@linkplain WithExceptionNode#replaceWithNonThrowing() Non-throwing} {@link WithExceptionNode}
  * are nodes where the {@linkplain WithExceptionNode#exceptionEdge() exception edge} is an
- * {@link UnreachableBeginNode} followed by an
- * {@link org.graalvm.compiler.nodes.UnreachableControlSinkNode}. This pattern is used to encode
- * that we have proven that the {@link WithExceptionNode} will never throw an exception.
+ * {@link UnreachableBeginNode} followed by an {@link UnreachableControlSinkNode}. This pattern is
+ * used to encode that we have proven that the {@link WithExceptionNode} will never throw an
+ * exception.
  *
  * 
  *                ...
@@ -851,7 +854,7 @@ static class Options {
     /**
      * Base class for snippet classes. It provides a cache for {@link SnippetTemplate}s.
      */
-    public abstract static class AbstractTemplates implements org.graalvm.compiler.api.replacements.SnippetTemplateCache {
+    public abstract static class AbstractTemplates implements SnippetTemplateCache {
 
         protected final OptionValues options;
         protected final SnippetReflectionProvider snippetReflection;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/Snippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/Snippets.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/Snippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/Snippets.java
index bcf989825530..76ed6692054f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/Snippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/Snippets.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.api.replacements.Snippet;
+import jdk.compiler.graal.api.replacements.Snippet;
 
 /**
  * Marker interface for a class that defines one or more {@link Snippet}s.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
index 7f1accbd3078..f928a933f6bc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StandardGraphBuilderPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.calc.Condition.LT;
-import static org.graalvm.compiler.core.common.memory.MemoryOrderMode.ACQUIRE;
-import static org.graalvm.compiler.core.common.memory.MemoryOrderMode.PLAIN;
-import static org.graalvm.compiler.core.common.memory.MemoryOrderMode.RELEASE;
-import static org.graalvm.compiler.core.common.memory.MemoryOrderMode.VOLATILE;
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CharsetName.ASCII;
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CharsetName.ISO_8859_1;
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.OFF_HEAP_LOCATION;
-import static org.graalvm.compiler.replacements.BoxingSnippets.Templates.getCacheClass;
-import static org.graalvm.compiler.replacements.nodes.AESNode.CryptMode.DECRYPT;
-import static org.graalvm.compiler.replacements.nodes.AESNode.CryptMode.ENCRYPT;
+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 java.lang.reflect.Array;
 import java.lang.reflect.Field;
@@ -49,166 +49,166 @@
 import java.util.Objects;
 import java.util.function.BiFunction;
 
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.calc.Condition.CanonicalizedCondition;
-import org.graalvm.compiler.core.common.calc.UnsignedMath;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeList;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.SpinWaitNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AbsNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.calc.IntegerMulHighNode;
-import org.graalvm.compiler.nodes.calc.IntegerNormalizeCompareNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
-import org.graalvm.compiler.nodes.calc.RoundNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.SignumNode;
-import org.graalvm.compiler.nodes.calc.SqrtNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRemNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.debug.BindToRegisterNode;
-import org.graalvm.compiler.nodes.debug.BlackholeNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchorNode;
-import org.graalvm.compiler.nodes.debug.NeverStripMineNode;
-import org.graalvm.compiler.nodes.debug.NeverWriteSinkNode;
-import org.graalvm.compiler.nodes.debug.SideEffectNode;
-import org.graalvm.compiler.nodes.debug.SpillRegistersNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.BoxNode.TrustedBoxedValue;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.extended.CacheWritebackNode;
-import org.graalvm.compiler.nodes.extended.CacheWritebackSyncNode;
-import org.graalvm.compiler.nodes.extended.ClassIsArrayNode;
-import org.graalvm.compiler.nodes.extended.GetClassNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.extended.JavaWriteNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.extended.ObjectIsArrayNode;
-import org.graalvm.compiler.nodes.extended.OpaqueValueNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.extended.SwitchCaseProbabilityNode;
-import org.graalvm.compiler.nodes.extended.UnboxNode;
-import org.graalvm.compiler.nodes.extended.UnsafeMemoryLoadNode;
-import org.graalvm.compiler.nodes.extended.UnsafeMemoryStoreNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.java.AtomicReadAndAddNode;
-import org.graalvm.compiler.nodes.java.AtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode;
-import org.graalvm.compiler.nodes.java.DynamicNewArrayNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.ReachabilityFenceNode;
-import org.graalvm.compiler.nodes.java.RegisterFinalizerNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
-import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.ConstantFoldUtil;
-import org.graalvm.compiler.nodes.util.ConstantReflectionUtil;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode;
-import org.graalvm.compiler.replacements.nodes.AESNode;
-import org.graalvm.compiler.replacements.nodes.AESNode.CryptMode;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode;
-import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode;
-import org.graalvm.compiler.replacements.nodes.CountPositivesNode;
-import org.graalvm.compiler.replacements.nodes.CounterModeAESNode;
-import org.graalvm.compiler.replacements.nodes.EncodeArrayNode;
-import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode;
-import org.graalvm.compiler.replacements.nodes.LogNode;
-import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.MD5Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
-import org.graalvm.compiler.replacements.nodes.ProfileBooleanNode;
-import org.graalvm.compiler.replacements.nodes.ReverseBitsNode;
-import org.graalvm.compiler.replacements.nodes.ReverseBytesNode;
-import org.graalvm.compiler.replacements.nodes.VirtualizableInvokeMacroNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerAddExactNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerAddExactOverflowNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerAddExactSplitNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerExactArithmeticSplitNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactOverflowNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerMulExactSplitNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerNegExactNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerNegExactOverflowNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerNegExactSplitNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactOverflowNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.IntegerSubExactSplitNode;
-import org.graalvm.compiler.replacements.nodes.arithmetic.UnsignedMulHighNode;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.Architecture;
@@ -2022,7 +2022,7 @@ private static void registerJFRThrowablePlugins(InvocationPlugins plugins, Repla
         r.register(new InlineOnlyInvocationPlugin("traceThrowable", Throwable.class, String.class) {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode throwable, ValueNode message) {
-                b.add(new VirtualizableInvokeMacroNode(MacroParams.of(b, targetMethod, throwable, message)));
+                b.add(new VirtualizableInvokeMacroNode(MacroNode.MacroParams.of(b, targetMethod, throwable, message)));
                 return true;
             }
         });
@@ -2069,7 +2069,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
                     return true;
                 }
                 b.addPush(JavaKind.Boolean,
-                                new ProfileBooleanNode(b.getConstantReflection(), MacroParams.of(b, targetMethod, result, counters)));
+                                new ProfileBooleanNode(b.getConstantReflection(), MacroNode.MacroParams.of(b, targetMethod, result, counters)));
                 return true;
             }
         });
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringHelperIntrinsics.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringHelperIntrinsics.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
index c39ed7e9cfb9..6e0620bfd069 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringHelperIntrinsics.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
 // JaCoCo Exclude
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringLatin1InflateNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringLatin1InflateNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
index db138f8fcd57..b70a2b6949be 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringLatin1InflateNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
@@ -23,24 +23,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_512;
+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 java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.replacements.nodes.MemoryKillStubIntrinsicNode;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringLatin1Snippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringLatin1Snippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
index 59fb2c10c79a..532d55a08d90 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringLatin1Snippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
@@ -23,23 +23,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY;
-import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability;
-import static org.graalvm.compiler.replacements.ReplacementsUtil.byteArrayBaseOffset;
-import static org.graalvm.compiler.replacements.ReplacementsUtil.byteArrayIndexScale;
-import static org.graalvm.compiler.replacements.StringHelperIntrinsics.getByte;
+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 org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -65,7 +63,7 @@ public Templates(OptionValues options, Providers providers) {
     public static final MetaAccessProvider INJECTED = null;
 
     private static long byteArrayOffset(long offset) {
-        return byteArrayBaseOffset(INJECTED) + (offset * byteArrayIndexScale(INJECTED));
+        return ReplacementsUtil.byteArrayBaseOffset(INJECTED) + (offset * ReplacementsUtil.byteArrayIndexScale(INJECTED));
     }
 
     @Snippet
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringUTF16CompressNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringUTF16CompressNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
index e7833191ebde..11359092af48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringUTF16CompressNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
@@ -23,24 +23,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_512;
+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 java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.replacements.nodes.MemoryKillStubIntrinsicNode;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringUTF16Snippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringUTF16Snippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
index 50dda4f6ec38..b0a3ca2bf96b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/StringUTF16Snippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
@@ -23,26 +23,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import static org.graalvm.compiler.api.directives.GraalDirectives.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.api.directives.GraalDirectives.UNLIKELY_PROBABILITY;
-import static org.graalvm.compiler.api.directives.GraalDirectives.injectBranchProbability;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.unknownProbability;
-import static org.graalvm.compiler.replacements.ReplacementsUtil.byteArrayBaseOffset;
-import static org.graalvm.compiler.replacements.ReplacementsUtil.charArrayIndexScale;
-import static org.graalvm.compiler.replacements.StringHelperIntrinsics.getByte;
+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 org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
@@ -75,7 +72,7 @@ private static int length(byte[] value) {
     }
 
     private static long byteArrayCharOffset(long offset) {
-        return byteArrayBaseOffset(INJECTED) + (offset * charArrayIndexScale(INJECTED));
+        return ReplacementsUtil.byteArrayBaseOffset(INJECTED) + (offset * ReplacementsUtil.charArrayIndexScale(INJECTED));
     }
 
     /**
@@ -124,13 +121,13 @@ public static int indexOfLatin1Unsafe(byte[] source, int sourceCount, byte[] tar
         ReplacementsUtil.dynamicAssert(sourceCount >= targetCount, "StringUTF16.indexOfLatin1Unsafe invalid args: sourceCount < targetCount");
         if (unknownProbability(targetCount == 1)) {
             return ArrayIndexOfNode.optimizedArrayIndexOf(JavaKind.Byte, Stride.S2, ArrayIndexOfVariant.MatchAny, source, byteArrayCharOffset(0), sourceCount, fromIndex,
-                            (char) Byte.toUnsignedInt(getByte(target, 0)));
+                            (char) Byte.toUnsignedInt(StringHelperIntrinsics.getByte(target, 0)));
         } else {
             int haystackLength = sourceCount - (targetCount - 2);
             int offset = fromIndex;
             if (injectBranchProbability(LIKELY_PROBABILITY, offset < haystackLength)) {
-                char c1 = (char) Byte.toUnsignedInt(getByte(target, 0));
-                char c2 = (char) Byte.toUnsignedInt(getByte(target, 1));
+                char c1 = (char) Byte.toUnsignedInt(StringHelperIntrinsics.getByte(target, 0));
+                char c2 = (char) Byte.toUnsignedInt(StringHelperIntrinsics.getByte(target, 1));
                 do {
                     int indexOfResult = ArrayIndexOfNode.optimizedArrayIndexOf(JavaKind.Byte, Stride.S2, ArrayIndexOfVariant.FindTwoConsecutive, source, byteArrayCharOffset(0), haystackLength, offset,
                                     c1, c2);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
index e764f0b50a3d..715c6c76f074 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/TargetGraphBuilderPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements;
+package jdk.compiler.graal.replacements;
 
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.compiler.graal.nodes.spi.Replacements;
+import jdk.compiler.graal.options.OptionValues;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64BitCountNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64BitCountNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
index 7d76da6b1983..842ffa4736cc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64BitCountNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
@@ -23,15 +23,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.aarch64;
+package jdk.compiler.graal.replacements.aarch64;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.nodes.BitCountNode;
+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;
 
 @NodeInfo(cycles = CYCLES_4, size = SIZE_4)
 public final class AArch64BitCountNode extends BitCountNode {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
index 4ff289e038e7..b0df694acf9c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64GraphBuilderPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
@@ -22,64 +22,56 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.aarch64;
-
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
+package jdk.compiler.graal.replacements.aarch64;
 
 import java.lang.reflect.Type;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CopySignNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.MaxNode;
-import org.graalvm.compiler.nodes.calc.MinNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.RoundFloatToIntegerNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.InvocationPluginHelper;
-import org.graalvm.compiler.replacements.SnippetSubstitutionInvocationPlugin;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.StringLatin1InflateNode;
-import org.graalvm.compiler.replacements.StringLatin1Snippets;
-import org.graalvm.compiler.replacements.StringUTF16CompressNode;
-import org.graalvm.compiler.replacements.StringUTF16Snippets;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
-import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.CountLeadingZerosNode;
-import org.graalvm.compiler.replacements.nodes.CountTrailingZerosNode;
-import org.graalvm.compiler.replacements.nodes.FloatToHalfFloatNode;
-import org.graalvm.compiler.replacements.nodes.FusedMultiplyAddNode;
-import org.graalvm.compiler.replacements.nodes.HalfFloatToFloatNode;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+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.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.code.Architecture;
@@ -164,12 +156,12 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
     private static void registerMathPlugins(InvocationPlugins plugins, boolean registerForeignCallMath) {
         Registration r = new Registration(plugins, Math.class);
         if (registerForeignCallMath) {
-            registerUnaryMath(r, "sin", SIN);
-            registerUnaryMath(r, "cos", COS);
-            registerUnaryMath(r, "tan", TAN);
-            registerUnaryMath(r, "exp", EXP);
-            registerUnaryMath(r, "log", LOG);
-            registerUnaryMath(r, "log10", LOG10);
+            registerUnaryMath(r, "sin", UnaryMathIntrinsicNode.UnaryOperation.SIN);
+            registerUnaryMath(r, "cos", UnaryMathIntrinsicNode.UnaryOperation.COS);
+            registerUnaryMath(r, "tan", UnaryMathIntrinsicNode.UnaryOperation.TAN);
+            registerUnaryMath(r, "exp", UnaryMathIntrinsicNode.UnaryOperation.EXP);
+            registerUnaryMath(r, "log", UnaryMathIntrinsicNode.UnaryOperation.LOG);
+            registerUnaryMath(r, "log10", UnaryMathIntrinsicNode.UnaryOperation.LOG10);
             r.register(new InlineOnlyInvocationPlugin("pow", double.class, double.class) {
                 @Override
                 public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) {
@@ -265,7 +257,7 @@ private static void registerStrictMathPlugins(InvocationPlugins plugins) {
         registerMinMax(r);
     }
 
-    private static void registerUnaryMath(Registration r, String name, UnaryOperation operation) {
+    private static void registerUnaryMath(Registration r, String name, UnaryMathIntrinsicNode.UnaryOperation operation) {
         r.register(new InlineOnlyInvocationPlugin(name, double.class) {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode value) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
index 57869752f5e6..28c783c4ae7a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
@@ -24,36 +24,34 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements.aarch64;
-
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.SignedDivNode;
-import org.graalvm.compiler.nodes.calc.SignedRemNode;
-import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRemNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.Snippets;
+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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
@@ -64,7 +62,7 @@
  * result to 0. These snippets throw an ArithmeticException if the denominator is 0 and otherwise
  * forward to the LIRGenerator.
  */
-public class AArch64IntegerArithmeticSnippets extends AbstractTemplates implements Snippets {
+public class AArch64IntegerArithmeticSnippets extends SnippetTemplate.AbstractTemplates implements Snippets {
 
     private final SnippetTemplate.SnippetInfo idiv;
     private final SnippetTemplate.SnippetInfo ldiv;
@@ -113,7 +111,7 @@ public void lower(IntegerDivRemNode node, LoweringTool tool) {
             throw GraalError.shouldNotReachHereUnexpectedValue(node); // ExcludeFromJacocoGeneratedReport
         }
         StructuredGraph graph = node.graph();
-        Arguments args = new Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
+        SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, graph.getGuardsStage(), tool.getLoweringStage());
         args.add("x", node.getX());
         args.add("y", node.getY());
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
index 015654e60fc1..6809620a903e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64ConvertSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
@@ -22,25 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.amd64;
-
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.unknownProbability;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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;
 
 /**
  * Snippets used for conversion operations on AMD64 where the AMD64 instruction used does not match
@@ -148,12 +144,12 @@ public static long d2l(double input, long result) {
         return result;
     }
 
-    public static class Templates extends AbstractTemplates {
+    public static class Templates extends SnippetTemplate.AbstractTemplates {
 
-        private final SnippetInfo f2i;
-        private final SnippetInfo f2l;
-        private final SnippetInfo d2i;
-        private final SnippetInfo d2l;
+        private final SnippetTemplate.SnippetInfo f2i;
+        private final SnippetTemplate.SnippetInfo f2l;
+        private final SnippetTemplate.SnippetInfo d2i;
+        private final SnippetTemplate.SnippetInfo d2l;
 
         @SuppressWarnings("this-escape")
         public Templates(OptionValues options, Providers providers) {
@@ -170,7 +166,7 @@ public void lower(FloatConvertNode convert, LoweringTool tool) {
                 return;
             }
 
-            SnippetInfo key;
+            SnippetTemplate.SnippetInfo key;
             switch (convert.getFloatConvert()) {
                 case F2I:
                     key = f2i;
@@ -190,13 +186,13 @@ public void lower(FloatConvertNode convert, LoweringTool tool) {
 
             StructuredGraph graph = convert.graph();
 
-            Arguments args = new Arguments(key, graph.getGuardsStage(), tool.getLoweringStage());
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(key, graph.getGuardsStage(), tool.getLoweringStage());
             args.add("input", convert.getValue());
             args.add("result", graph.unique(new AMD64FloatConvertNode(convert.getFloatConvert(), convert.getValue())));
 
             SnippetTemplate template = template(tool, convert, args);
             convert.getDebug().log("Lowering %s in %s: node=%s, template=%s, arguments=%s", convert.getFloatConvert(), graph, convert, template, args);
-            template.instantiate(tool.getMetaAccess(), convert, DEFAULT_REPLACER, tool, args);
+            template.instantiate(tool.getMetaAccess(), convert, SnippetTemplate.DEFAULT_REPLACER, tool, args);
             convert.safeDelete();
         }
     }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
index f0fcd490abfe..62a6034fc049 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64FloatConvertNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.amd64;
+package jdk.compiler.graal.replacements.amd64;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-import static org.graalvm.compiler.nodes.calc.BinaryArithmeticNode.getArithmeticOpTable;
+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 org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.FloatConvertOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.UnaryOp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.calc.UnaryArithmeticNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
index 30a4696bc2c8..0b8192a98dfa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64GraphBuilderPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
@@ -22,73 +22,71 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.amd64;
+package jdk.compiler.graal.replacements.amd64;
 
-import static org.graalvm.compiler.nodes.calc.FloatTypeTestNode.FloatTypeTestOp.IS_INFINITE;
-import static org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation.POW;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.COS;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.EXP;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.LOG10;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.SIN;
-import static org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation.TAN;
+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 java.lang.reflect.Type;
 import java.util.Arrays;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompressBitsNode;
-import org.graalvm.compiler.nodes.calc.CopySignNode;
-import org.graalvm.compiler.nodes.calc.ExpandBitsNode;
-import org.graalvm.compiler.nodes.calc.FloatTypeTestNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.MaxNode;
-import org.graalvm.compiler.nodes.calc.MinNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.RoundFloatToIntegerNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.memory.address.IndexAddressNode;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.InvocationPluginHelper;
-import org.graalvm.compiler.replacements.SnippetSubstitutionInvocationPlugin;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.ArrayEqualsInvocationPlugin;
-import org.graalvm.compiler.replacements.StringLatin1InflateNode;
-import org.graalvm.compiler.replacements.StringLatin1Snippets;
-import org.graalvm.compiler.replacements.StringUTF16CompressNode;
-import org.graalvm.compiler.replacements.StringUTF16Snippets;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
-import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import org.graalvm.compiler.replacements.nodes.BitCountNode;
-import org.graalvm.compiler.replacements.nodes.CountLeadingZerosNode;
-import org.graalvm.compiler.replacements.nodes.CountTrailingZerosNode;
-import org.graalvm.compiler.replacements.nodes.FloatToHalfFloatNode;
-import org.graalvm.compiler.replacements.nodes.FusedMultiplyAddNode;
-import org.graalvm.compiler.replacements.nodes.HalfFloatToFloatNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
-import org.graalvm.compiler.replacements.nodes.VectorizedHashCodeNode;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.amd64.AMD64.CPUFeature;
@@ -220,7 +218,7 @@ private static void registerMathPlugins(InvocationPlugins plugins, AMD64 arch, R
         registerUnaryMath(r, "log", LOG);
         registerUnaryMath(r, "log10", LOG10);
         registerUnaryMath(r, "exp", EXP);
-        registerBinaryMath(r, "pow", POW);
+        registerBinaryMath(r, "pow", BinaryMathIntrinsicNode.BinaryOperation.POW);
         registerUnaryMath(r, "sin", SIN);
         registerUnaryMath(r, "cos", COS);
         registerUnaryMath(r, "tan", TAN);
@@ -295,7 +293,7 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
         });
     }
 
-    private static void registerBinaryMath(Registration r, String name, BinaryOperation operation) {
+    private static void registerBinaryMath(Registration r, String name, BinaryMathIntrinsicNode.BinaryOperation operation) {
         r.register(new InvocationPlugin(name, double.class, double.class) {
             @Override
             public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Receiver receiver, ValueNode x, ValueNode y) {
@@ -557,8 +555,8 @@ public boolean apply(GraphBuilderContext b, ResolvedJavaMethod targetMethod, Rec
 
     private static void registerArraysEqualsPlugins(InvocationPlugins plugins, Replacements replacements) {
         Registration r = new Registration(plugins, Arrays.class, replacements);
-        r.register(new ArrayEqualsInvocationPlugin(JavaKind.Float, float[].class, float[].class));
-        r.register(new ArrayEqualsInvocationPlugin(JavaKind.Double, double[].class, double[].class));
+        r.register(new StandardGraphBuilderPlugins.ArrayEqualsInvocationPlugin(JavaKind.Float, float[].class, float[].class));
+        r.register(new StandardGraphBuilderPlugins.ArrayEqualsInvocationPlugin(JavaKind.Double, double[].class, double[].class));
     }
 
     // Sync with ArraysSupport.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64IntrinsicStubs.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64IntrinsicStubs.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
index 2ab92eecd447..64f6bd85416c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/amd64/AMD64IntrinsicStubs.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.amd64;
+package jdk.compiler.graal.replacements.amd64;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.asm.amd64.AVXKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.StrideUtil;
-import org.graalvm.compiler.lir.amd64.AMD64ArrayEqualsOp;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsWithMaskNode;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
+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.vm.ci.amd64.AMD64;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
index ae4da7e08d0f..a15620fa31ee 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyCallNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
@@ -23,42 +23,42 @@
  * questions.
  */
 //JaCoCo Exclude
-package org.graalvm.compiler.replacements.arraycopy;
+package jdk.compiler.graal.replacements.arraycopy;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+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 java.util.Arrays;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GetObjectAddressNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.word.WordTypes;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.CodeUtil;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
index 141b590eb663..af81b1ae541d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.arraycopy;
+package jdk.compiler.graal.replacements.arraycopy;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
 
 public interface ArrayCopyForeignCalls extends ForeignCallsProvider, ArrayCopyLookup {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
index 6a8e0567d842..5a5a3307767a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyLookup.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.arraycopy;
+package jdk.compiler.graal.replacements.arraycopy;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
index c2596f784063..e70c47061209 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
@@ -22,26 +22,27 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.arraycopy;
+package jdk.compiler.graal.replacements.arraycopy;
 
 import static org.graalvm.word.LocationIdentity.any;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
+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 org.graalvm.word.LocationIdentity;
 
 /**
  * This node intrinsifies {@link System#arraycopy}.
  *
- * Lowering is implemented in the platform/VM specific
- * {@link org.graalvm.compiler.nodes.spi.LoweringProvider LoweringProvider}. Most of them eventually
- * go through
- * {@link ArrayCopySnippets.Templates#lower(ArrayCopyNode, boolean, org.graalvm.compiler.nodes.spi.LoweringTool)}.
+ * Lowering is implemented in the platform/VM specific {@link LoweringProvider LoweringProvider}.
+ * Most of them eventually go through
+ * {@link ArrayCopySnippets.Templates#lower(ArrayCopyNode, boolean, LoweringTool)}.
  */
 @NodeInfo
 public final class ArrayCopyNode extends BasicArrayCopyNode implements Lowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
index 36a410121b3b..2f6ba9270351 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopySnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
@@ -22,61 +22,58 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.arraycopy;
+package jdk.compiler.graal.replacements.arraycopy;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.DEOPT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+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 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 org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.api.replacements.Fold.InjectedParameter;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.replacements.SnippetCounter;
-import org.graalvm.compiler.replacements.SnippetCounter.Group;
-import org.graalvm.compiler.replacements.SnippetIntegerHistogram;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
@@ -459,10 +456,10 @@ protected static class Counters {
         public final EnumMap arraycopyCallCopiedCounters = new EnumMap<>(JavaKind.class);
 
         Counters(SnippetCounter.Group.Factory factory) {
-            final Group checkCounters = factory.createSnippetCounterGroup("System.arraycopy checkInputs");
-            final Group callCounters = factory.createSnippetCounterGroup("System.arraycopy calls");
-            final Group copiedElementsCounters = factory.createSnippetCounterGroup("System.arraycopy copied elements");
-            final Group lengthCounters = factory.createSnippetCounterGroup("System.arraycopy with 0-length");
+            final SnippetCounter.Group checkCounters = factory.createSnippetCounterGroup("System.arraycopy checkInputs");
+            final SnippetCounter.Group callCounters = factory.createSnippetCounterGroup("System.arraycopy calls");
+            final SnippetCounter.Group copiedElementsCounters = factory.createSnippetCounterGroup("System.arraycopy copied elements");
+            final SnippetCounter.Group lengthCounters = factory.createSnippetCounterGroup("System.arraycopy with 0-length");
 
             checkSuccessCounter = new SnippetCounter(checkCounters, "checkSuccess", "checkSuccess");
             checkAIOOBECounter = new SnippetCounter(checkCounters, "checkAIOOBE", "checkAIOOBE");
@@ -492,7 +489,7 @@ protected static class Counters {
             createArraycopyCounter(JavaKind.Object, callCounters, copiedElementsCounters);
         }
 
-        void createArraycopyCounter(JavaKind kind, Group counters, Group copiedCounters) {
+        void createArraycopyCounter(JavaKind kind, SnippetCounter.Group counters, SnippetCounter.Group copiedCounters) {
             arraycopyCallCounters.put(kind, new SnippetCounter(counters, kind + "[] stub", "arraycopy call for " + kind + "[] arrays"));
             arraycopyCallCopiedCounters.put(kind, new SnippetCounter(copiedCounters, kind + "[] stub", "arraycopy call for " + kind + "[] arrays"));
         }
@@ -532,14 +529,14 @@ public enum WorkSnippetID {
     }
 
     public static class Templates extends SnippetTemplate.AbstractTemplates {
-        private final SnippetInfo delayedGenericArraycopySnippet;
-        private final SnippetInfo delayedExactArraycopyWithExpandedLoopSnippet;
-        private final SnippetInfo arraycopyExactStubCallSnippet;
-        private final SnippetInfo delayedCheckcastArraycopySnippet;
-        private final SnippetInfo arraycopyNativeExceptionSnippet;
-        private final SnippetInfo checkcastArraycopySnippet;
-        private final SnippetInfo genericArraycopySnippet;
-        private final SnippetInfo exactArraycopyWithExpandedLoopSnippet;
+        private final SnippetTemplate.SnippetInfo delayedGenericArraycopySnippet;
+        private final SnippetTemplate.SnippetInfo delayedExactArraycopyWithExpandedLoopSnippet;
+        private final SnippetTemplate.SnippetInfo arraycopyExactStubCallSnippet;
+        private final SnippetTemplate.SnippetInfo delayedCheckcastArraycopySnippet;
+        private final SnippetTemplate.SnippetInfo arraycopyNativeExceptionSnippet;
+        private final SnippetTemplate.SnippetInfo checkcastArraycopySnippet;
+        private final SnippetTemplate.SnippetInfo genericArraycopySnippet;
+        private final SnippetTemplate.SnippetInfo exactArraycopyWithExpandedLoopSnippet;
 
         private final boolean useOriginalArraycopy;
         private ResolvedJavaMethod originalArraycopy;
@@ -547,7 +544,7 @@ public static class Templates extends SnippetTemplate.AbstractTemplates {
         private final Supplier> midTierPreLoweringPhaseFactory;
 
         @SuppressWarnings("this-escape")
-        public Templates(ArrayCopySnippets receiver, Group.Factory factory, OptionValues options, Providers providers) {
+        public Templates(ArrayCopySnippets receiver, SnippetCounter.Group.Factory factory, OptionValues options, Providers providers) {
             super(options, providers);
             this.counters = new Counters(factory);
 
@@ -563,7 +560,7 @@ public Templates(ArrayCopySnippets receiver, Group.Factory factory, OptionValues
             midTierPreLoweringPhaseFactory = receiver.midTierPreLoweringPhaseFactory();
         }
 
-        private SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
+        private SnippetTemplate.SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
             switch (workSnippetID) {
                 case exactArraycopyWithExpandedLoopSnippet:
                     return exactArraycopyWithExpandedLoopSnippet;
@@ -575,8 +572,8 @@ private SnippetInfo getSnippet(WorkSnippetID workSnippetID) {
             throw GraalError.shouldNotReachHere(workSnippetID.toString()); // ExcludeFromJacocoGeneratedReport
         }
 
-        protected SnippetInfo snippet(Providers providers, ArrayCopySnippets receiver, String methodName) {
-            SnippetInfo info = snippet(providers,
+        protected SnippetTemplate.SnippetInfo snippet(Providers providers, ArrayCopySnippets receiver, String methodName) {
+            SnippetTemplate.SnippetInfo info = snippet(providers,
                             ArrayCopySnippets.class,
                             methodName,
                             originalArraycopy(providers.getMetaAccess()),
@@ -600,7 +597,7 @@ public void lower(ArrayCopyNode arraycopy, LoweringTool tool) {
          */
         public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, LoweringTool tool) {
             JavaKind elementKind = BasicArrayCopyNode.selectComponentKind(arraycopy);
-            SnippetInfo snippetInfo;
+            SnippetTemplate.SnippetInfo snippetInfo;
             final ArrayCopyTypeCheck arrayTypeCheck;
 
             ResolvedJavaType srcType = StampTool.typeOrNull(arraycopy.getSource().stamp(NodeView.DEFAULT));
@@ -658,7 +655,7 @@ public void lower(ArrayCopyNode arraycopy, boolean mayExpandThisArraycopy, Lower
             }
 
             // create the snippet
-            Arguments args = new Arguments(snippetInfo, arraycopy.graph().getGuardsStage(), tool.getLoweringStage());
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippetInfo, arraycopy.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("src", arraycopy.getSource());
             args.add("srcPos", arraycopy.getSourcePosition());
             args.add("dest", arraycopy.getDestination());
@@ -692,7 +689,7 @@ public void lower(ArrayCopyWithDelayedLoweringNode arraycopy, LoweringTool tool)
                 return;
             }
 
-            Arguments args = new Arguments(getSnippet(arraycopy.getSnippet()), arraycopy.graph().getGuardsStage(), tool.getLoweringStage());
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(getSnippet(arraycopy.getSnippet()), arraycopy.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("src", arraycopy.getSource());
             args.add("srcPos", arraycopy.getSourcePosition());
             args.add("dest", arraycopy.getDestination());
@@ -716,7 +713,7 @@ private static boolean canBeArray(ResolvedJavaType type) {
          * Instantiate the snippet template and fix up the FrameState of any Invokes of
          * System.arraycopy and propagate the captured bci in the ArrayCopySlowPathNode.
          */
-        private void instantiate(LoweringTool tool, Arguments args, BasicArrayCopyNode arraycopy) {
+        private void instantiate(LoweringTool tool, SnippetTemplate.Arguments args, BasicArrayCopyNode arraycopy) {
             StructuredGraph graph = arraycopy.graph();
             SnippetTemplate template = template(tool, arraycopy, args);
             UnmodifiableEconomicMap duplicates = template.instantiate(tool.getMetaAccess(), arraycopy, SnippetTemplate.DEFAULT_REPLACER, args, false);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
index 7b7a3a09f4aa..e415e7782f19 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.arraycopy;
+package jdk.compiler.graal.replacements.arraycopy;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.loop.LoopExpandableNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
+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.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/Classfile.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/Classfile.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/Classfile.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/Classfile.java
index 7cf9b9edd471..29fcb1f41b20 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/Classfile.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/Classfile.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.classfile;
+package jdk.compiler.graal.replacements.classfile;
 
 import java.io.DataInputStream;
 import java.io.IOException;
@@ -30,7 +30,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.Utf8;
+import jdk.compiler.graal.replacements.classfile.ClassfileConstant.Utf8;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
index 40b93873ee7a..bc6010f54537 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
@@ -22,16 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.classfile;
+package jdk.compiler.graal.replacements.classfile;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.Utf8;
+import jdk.compiler.graal.bytecode.Bytecode;
+import jdk.compiler.graal.bytecode.BytecodeProvider;
+import jdk.compiler.graal.debug.GraalError;
 
 import jdk.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.ExceptionHandler;
@@ -85,7 +84,7 @@ public BytecodeProvider getOrigin() {
     private void readCodeAttributes(DataInputStream stream) throws IOException {
         int count = stream.readUnsignedShort();
         for (int i = 0; i < count; i++) {
-            String attributeName = constantPool.get(Utf8.class, stream.readUnsignedShort()).value;
+            String attributeName = constantPool.get(ClassfileConstant.Utf8.class, stream.readUnsignedShort()).value;
             int attributeLength = stream.readInt();
             switch (attributeName) {
                 case "LocalVariableTable": {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
index 28d6fbec9bac..d07b7f65746d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileBytecodeProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.classfile;
+package jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
index 2a070f947451..3739bfff802b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileConstant.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.classfile;
+package jdk.compiler.graal.replacements.classfile;
 
-import static org.graalvm.compiler.bytecode.Bytecodes.GETFIELD;
-import static org.graalvm.compiler.bytecode.Bytecodes.GETSTATIC;
-import static org.graalvm.compiler.bytecode.Bytecodes.PUTFIELD;
-import static org.graalvm.compiler.bytecode.Bytecodes.PUTSTATIC;
+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 java.io.DataInputStream;
 import java.io.IOException;
 
-import org.graalvm.compiler.bytecode.Bytecodes;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.bytecode.Bytecodes;
+import jdk.compiler.graal.debug.GraalError;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
index a9347af0539e..4efaed684466 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ClassfileConstantPool.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.classfile;
+package jdk.compiler.graal.replacements.classfile;
 
-import static org.graalvm.compiler.replacements.classfile.Classfile.skipFully;
-import static org.graalvm.compiler.replacements.classfile.ClassfileConstant.CONSTANT_Class;
+import static jdk.compiler.graal.replacements.classfile.Classfile.skipFully;
+import static jdk.compiler.graal.replacements.classfile.ClassfileConstant.CONSTANT_Class;
 
 import java.io.DataInputStream;
 import java.io.IOException;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.ClassRef;
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.ExecutableRef;
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.FieldRef;
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.Primitive;
-import org.graalvm.compiler.replacements.classfile.ClassfileConstant.Utf8;
+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.vm.ci.meta.ConstantPool;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ConstantPoolPatch.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ConstantPoolPatch.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
index f0e4039499aa..c8833302d21d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/classfile/ConstantPoolPatch.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.classfile;
+package jdk.compiler.graal.replacements.classfile;
 
 import jdk.vm.ci.meta.JavaMethod;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
index 875d5f04c52d..d1b1db056007 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/G1WriteBarrierSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
@@ -22,48 +22,44 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.gc;
-
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.extended.NullCheckNode;
-import org.graalvm.compiler.nodes.gc.G1ArrayRangePostWriteBarrier;
-import org.graalvm.compiler.nodes.gc.G1ArrayRangePreWriteBarrier;
-import org.graalvm.compiler.nodes.gc.G1PostWriteBarrier;
-import org.graalvm.compiler.nodes.gc.G1PreWriteBarrier;
-import org.graalvm.compiler.nodes.gc.G1ReferentFieldReadBarrier;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode.Address;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
-import org.graalvm.compiler.replacements.SnippetCounter;
-import org.graalvm.compiler.replacements.SnippetCounter.Group;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
-import org.graalvm.compiler.replacements.nodes.CStringConstant;
-import org.graalvm.compiler.word.Word;
+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;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.UnsignedWord;
@@ -91,7 +87,7 @@ public abstract class G1WriteBarrierSnippets extends WriteBarrierSnippets implem
 
     public static class Counters {
         Counters(SnippetCounter.Group.Factory factory) {
-            Group countersWriteBarriers = factory.createSnippetCounterGroup("G1 WriteBarriers");
+            SnippetCounter.Group countersWriteBarriers = factory.createSnippetCounterGroup("G1 WriteBarriers");
             g1AttemptedPreWriteBarrierCounter = new SnippetCounter(countersWriteBarriers, "g1AttemptedPreWriteBarrier", "Number of attempted G1 Pre Write Barriers");
             g1EffectivePreWriteBarrierCounter = new SnippetCounter(countersWriteBarriers, "g1EffectivePreWriteBarrier", "Number of effective G1 Pre Write Barriers");
             g1ExecutedPreWriteBarrierCounter = new SnippetCounter(countersWriteBarriers, "g1ExecutedPreWriteBarrier", "Number of executed G1 Pre Write Barriers");
@@ -435,12 +431,12 @@ private void g1PostBarrierStub(Word cardAddress) {
     public abstract static class G1WriteBarrierLowerer {
         private final Counters counters;
 
-        public G1WriteBarrierLowerer(Group.Factory factory) {
+        public G1WriteBarrierLowerer(SnippetCounter.Group.Factory factory) {
             this.counters = new Counters(factory);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo snippet, G1PreWriteBarrier barrier, LoweringTool tool) {
-            Arguments args = new Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo snippet, G1PreWriteBarrier barrier, LoweringTool tool) {
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
             AddressNode address = barrier.getAddress();
             args.add("address", address);
             if (address instanceof OffsetAddressNode) {
@@ -463,8 +459,8 @@ public void lower(AbstractTemplates templates, SnippetInfo snippet, G1PreWriteBa
             templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, SnippetTemplate.DEFAULT_REPLACER, args);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo snippet, G1ReferentFieldReadBarrier barrier, LoweringTool tool) {
-            Arguments args = new Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo snippet, G1ReferentFieldReadBarrier barrier, LoweringTool tool) {
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
             // This is expected to be lowered before address lowering
             OffsetAddressNode address = (OffsetAddressNode) barrier.getAddress();
             args.add("address", address);
@@ -482,13 +478,13 @@ public void lower(AbstractTemplates templates, SnippetInfo snippet, G1ReferentFi
             templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, SnippetTemplate.DEFAULT_REPLACER, args);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo snippet, G1PostWriteBarrier barrier, LoweringTool tool) {
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo snippet, G1PostWriteBarrier barrier, LoweringTool tool) {
             if (barrier.alwaysNull()) {
                 barrier.graph().removeFixed(barrier);
                 return;
             }
 
-            Arguments args = new Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
             AddressNode address = barrier.getAddress();
             args.add("address", address);
             if (address instanceof OffsetAddressNode) {
@@ -511,8 +507,8 @@ public void lower(AbstractTemplates templates, SnippetInfo snippet, G1PostWriteB
             templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, SnippetTemplate.DEFAULT_REPLACER, args);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo snippet, G1ArrayRangePreWriteBarrier barrier, LoweringTool tool) {
-            Arguments args = new Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo snippet, G1ArrayRangePreWriteBarrier barrier, LoweringTool tool) {
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("address", barrier.getAddress());
             args.add("length", barrier.getLengthAsLong());
             args.addConst("elementStride", barrier.getElementStride());
@@ -520,8 +516,8 @@ public void lower(AbstractTemplates templates, SnippetInfo snippet, G1ArrayRange
             templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, SnippetTemplate.DEFAULT_REPLACER, args);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo snippet, G1ArrayRangePostWriteBarrier barrier, LoweringTool tool) {
-            Arguments args = new Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo snippet, G1ArrayRangePostWriteBarrier barrier, LoweringTool tool) {
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("address", barrier.getAddress());
             args.add("length", barrier.getLengthAsLong());
             args.addConst("elementStride", barrier.getElementStride());
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
similarity index 67%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
index e0f6d53efcca..f05a023881f3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/SerialWriteBarrierSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
@@ -22,34 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.gc;
-
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.nodes.gc.SerialArrayRangeWriteBarrier;
-import org.graalvm.compiler.nodes.gc.SerialWriteBarrier;
-import org.graalvm.compiler.nodes.memory.address.AddressNode.Address;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.replacements.SnippetCounter;
-import org.graalvm.compiler.replacements.SnippetCounter.Group;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
-import org.graalvm.compiler.word.Word;
+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;
 import org.graalvm.word.Pointer;
 
 public abstract class SerialWriteBarrierSnippets extends WriteBarrierSnippets implements Snippets {
     static class Counters {
         Counters(SnippetCounter.Group.Factory factory) {
-            Group countersWriteBarriers = factory.createSnippetCounterGroup("Serial WriteBarriers");
+            SnippetCounter.Group countersWriteBarriers = factory.createSnippetCounterGroup("Serial WriteBarriers");
             serialWriteBarrierCounter = new SnippetCounter(countersWriteBarriers, "serialWriteBarrier", "Number of Serial Write Barriers");
         }
 
@@ -112,33 +108,34 @@ private void serialWriteBarrier(Pointer ptr, Counters counters, boolean verifyOn
     public static class SerialWriteBarrierLowerer {
         private final Counters counters;
 
-        public SerialWriteBarrierLowerer(Group.Factory factory) {
+        public SerialWriteBarrierLowerer(SnippetCounter.Group.Factory factory) {
             this.counters = new Counters(factory);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo preciseSnippet, SnippetInfo impreciseSnippet, SerialWriteBarrier barrier, LoweringTool tool) {
-            Arguments args;
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo preciseSnippet, SnippetTemplate.SnippetInfo impreciseSnippet, SerialWriteBarrier barrier,
+                        LoweringTool tool) {
+            SnippetTemplate.Arguments args;
             if (barrier.usePrecise()) {
-                args = new Arguments(preciseSnippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+                args = new SnippetTemplate.Arguments(preciseSnippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
                 args.add("address", barrier.getAddress());
             } else {
-                args = new Arguments(impreciseSnippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+                args = new SnippetTemplate.Arguments(impreciseSnippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
                 OffsetAddressNode address = (OffsetAddressNode) barrier.getAddress();
                 args.add("object", address.getBase());
             }
             args.addConst("counters", counters);
             args.addConst("verifyOnly", barrier.getVerifyOnly());
 
-            templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, DEFAULT_REPLACER, args);
+            templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, SnippetTemplate.DEFAULT_REPLACER, args);
         }
 
-        public void lower(AbstractTemplates templates, SnippetInfo snippet, SerialArrayRangeWriteBarrier barrier, LoweringTool tool) {
-            Arguments args = new Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
+        public void lower(SnippetTemplate.AbstractTemplates templates, SnippetTemplate.SnippetInfo snippet, SerialArrayRangeWriteBarrier barrier, LoweringTool tool) {
+            SnippetTemplate.Arguments args = new SnippetTemplate.Arguments(snippet, barrier.graph().getGuardsStage(), tool.getLoweringStage());
             args.add("address", barrier.getAddress());
             args.add("length", barrier.getLengthAsLong());
             args.addConst("elementStride", barrier.getElementStride());
 
-            templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, DEFAULT_REPLACER, args);
+            templates.template(tool, barrier, args).instantiate(tool.getMetaAccess(), barrier, SnippetTemplate.DEFAULT_REPLACER, args);
         }
     }
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
index 66f015948978..dad25b2a23b0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/gc/WriteBarrierSnippets.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.gc;
+package jdk.compiler.graal.replacements.gc;
 
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_LIKELY_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+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 org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode.Address;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
-import org.graalvm.compiler.word.Word;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.WordFactory;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/AESNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AESNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/AESNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AESNode.java
index 713b3a45c43b..081874989de0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/AESNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AESNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
index e16ec740f0dd..46b603317454 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.core.common.Stride;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.debug.GraalError;
 import org.graalvm.word.Pointer;
 
 public final class ArrayCompareToForeignCalls {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
index c0a55093db9d..f2396180795d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCompareToNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1024;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1024;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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 org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
index 402c55a58d6a..03b9b65ff44c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
@@ -22,14 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode.KILLED_LOCATIONS;
-
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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;
 
 public final class ArrayCopyWithConversionsForeignCalls {
     private static final ForeignCallDescriptor STUB_DYNAMIC_STRIDES = foreignCallDescriptor(
@@ -58,7 +56,7 @@ private static ForeignCallDescriptor foreignCallDescriptor(String name) {
     }
 
     private static ForeignCallDescriptor foreignCallDescriptor(String name, Class... argTypes) {
-        return new ForeignCallDescriptor(name, void.class, argTypes, false, KILLED_LOCATIONS, false, false);
+        return new ForeignCallDescriptor(name, void.class, argTypes, false, ArrayCopyWithConversionsNode.KILLED_LOCATIONS, false, false);
     }
 
     public static ForeignCallDescriptor getStub(ArrayCopyWithConversionsNode node) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCopyWithConversionsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCopyWithConversionsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
index 8550fd15791c..c94120c8886c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayCopyWithConversionsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
@@ -22,24 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+import static jdk.compiler.graal.nodeinfo.InputType.Memory;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -67,7 +68,7 @@ public class ArrayCopyWithConversionsNode extends MemoryKillStubIntrinsicNode {
 
     /**
      * Optional argument for dispatching to any combination of strides at runtime, as described in
-     * {@link org.graalvm.compiler.core.common.StrideUtil}.
+     * {@link StrideUtil}.
      */
     @OptionalInput protected ValueNode dynamicStrides;
 
@@ -100,8 +101,7 @@ public ArrayCopyWithConversionsNode(ValueNode arraySrc, ValueNode offsetSrc, Val
     }
 
     /**
-     * Variant with dynamicStride parameter, as described in
-     * {@link org.graalvm.compiler.core.common.StrideUtil}.
+     * Variant with dynamicStride parameter, as described in {@link StrideUtil}.
      */
     public ArrayCopyWithConversionsNode(ValueNode arraySrc, ValueNode offsetSrc, ValueNode arrayDst, ValueNode offsetDst, ValueNode length, ValueNode dynamicStrides) {
         this(TYPE, arraySrc, offsetSrc, arrayDst, offsetDst, length, dynamicStrides, null, null, null);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
index 7e25b84dff64..b83b4f61d6bf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.StrideUtil;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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 org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
index 29ad8abbb9a2..d6b7bad52588 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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 org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
index 673548acb35d..16bf4630ac69 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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 org.graalvm.word.Pointer;
 
 public final class ArrayEqualsWithMaskForeignCalls {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
index ba77101c40ed..3540ecedad48 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 import java.util.stream.Stream;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
+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.vm.ci.amd64.AMD64;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfMacroNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfMacroNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
index a6e6ccd18f2d..56297b85dd20 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfMacroNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.Architecture;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
index b9fc22207eb9..547b5a41ea14 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayIndexOfNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.ConstantReflectionUtil;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionCompareToForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionCompareToForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
index 74b043b5250f..c612ddaa588b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionCompareToForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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;
 
 public final class ArrayRegionCompareToForeignCalls {
     private static final ForeignCallDescriptor STUB_DYNAMIC_STRIDES = ForeignCalls.pureFunctionForeignCallDescriptor("arrayRegionCompareToDynamicStrides",
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionCompareToNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionCompareToNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
index f26af7b5ddb3..676a6ad45e46 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionCompareToNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
@@ -22,28 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.ConstantReflectionUtil;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -114,7 +115,7 @@ public class ArrayRegionCompareToNode extends PureFunctionStubIntrinsicNode impl
 
     /**
      * Optional argument for dispatching to any combination of strides at runtime, as described in
-     * {@link org.graalvm.compiler.core.common.StrideUtil}.
+     * {@link StrideUtil}.
      */
     @OptionalInput protected ValueNode dynamicStrides;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
index ad417859bd54..e88ada620a95 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
@@ -22,28 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.ConstantReflectionUtil;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -95,7 +96,7 @@ public class ArrayRegionEqualsNode extends PureFunctionStubIntrinsicNode impleme
 
     /**
      * Optional argument for dispatching to any combination of strides at runtime, as described in
-     * {@link org.graalvm.compiler.core.common.StrideUtil}.
+     * {@link StrideUtil}.
      */
     @OptionalInput protected ValueNode dynamicStrides;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsWithMaskNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
index b89773e9fdf1..f00d61f12680 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
@@ -22,28 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.util.ConstantReflectionUtil;
-import org.graalvm.compiler.replacements.NodeStrideUtil;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
@@ -86,8 +87,8 @@ public final class ArrayRegionEqualsWithMaskNode extends PureFunctionStubIntrins
 
     /**
      * Optional argument for dispatching to any combination of strides at runtime, as described in
-     * {@link org.graalvm.compiler.core.common.StrideUtil}. When this parameter is used,
-     * {@link #strideMask} is assumed to be equal to {@link #strideB}.
+     * {@link StrideUtil}. When this parameter is used, {@link #strideMask} is assumed to be equal
+     * to {@link #strideB}.
      */
     @OptionalInput protected ValueNode dynamicStrides;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
index 55541e056e28..37ca7f747d0e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/AssertionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_IGNORED;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_IGNORED;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * Assertion nodes will go away as soon as the value evaluates to true. Compile-time assertions will
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
index 97bfd8ad89d5..26150b195c57 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BasicArrayCopyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+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 org.graalvm.word.LocationIdentity.any;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptBciSupplier;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.code.BytecodeFrame;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
index 5cb9d43cd996..d6ccb31f8569 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BasicObjectCloneNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerMulAddNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerMulAddNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
index 0dd4a4628045..8c72f692277f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerMulAddNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerMultiplyToLenNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerMultiplyToLenNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
index ce3e8120ac05..f9d8c0230b9a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerMultiplyToLenNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerSquareToLenNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerSquareToLenNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
index 34c9b6be07f1..5711f8e548c3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BigIntegerSquareToLenNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
index bbcf03522b94..3ca9cea9781b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BinaryMathIntrinsicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1024;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.calc.FloatDivNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.SqrtNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
index e940cef0c9a9..d3662a630400 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitCountNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
index 5e50091b8ecd..560f3c36eb4e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitScanForwardNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
index 7c4e7ae395eb..0798179572ca 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/BitScanReverseNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
index 56e209b38ae0..61ee7a8f4d4f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CStringConstant.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.util.Objects;
 
-import org.graalvm.compiler.core.common.type.DataPointerConstant;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.word.Word;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
index 5bf33d989b85..5315239502d0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesMacroNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesMacroNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
index 901d19043bd7..ea840fa77d23 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesMacroNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
index cab365760952..6fae0e0024fb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CalcStringAttributesNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CipherBlockChainingAESNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CipherBlockChainingAESNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
index 9230dd2e97a4..fec2dd398f68 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CipherBlockChainingAESNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.replacements.nodes.AESNode.CryptMode;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountLeadingZerosNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountLeadingZerosNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
index a7907ad10b18..f7aabd9f8bc3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountLeadingZerosNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountPositivesNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountPositivesNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
index 553199836114..d98e4ade9981 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountPositivesNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.Pointer;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountTrailingZerosNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountTrailingZerosNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
index 3f9a569f403b..36a05dfff28a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CountTrailingZerosNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.type.StampTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CounterModeAESNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CounterModeAESNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
index f572a9613331..75e13bba087c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/CounterModeAESNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/EncodeArrayNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/EncodeArrayNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
index 3ebc45d033a0..5fb068c9a6d5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/EncodeArrayNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+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 java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool.CharsetName;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
index c66d4052dc51..fe37cddc519c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ExplodeLoopNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.ArrayList;
 
-import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.spi.NodeWithIdentity;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
+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;
 
 /**
  * Placeholder node to denote to snippet preparation that the following loop must be completely
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
index 90f5d5f1b134..86693ad42892 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FallbackInvokeWithExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.Value;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static org.graalvm.compiler.nodes.Invoke.CYCLES_UNKNOWN_RATIONALE;
-import static org.graalvm.compiler.nodes.Invoke.SIZE_UNKNOWN_RATIONALE;
+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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FloatToHalfFloatNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FloatToHalfFloatNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
index 54504d3ea21e..4b3a3e80517b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FloatToHalfFloatNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ForeignCalls.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ForeignCalls.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
index e3043afd0032..1bcb7d275308 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ForeignCalls.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
 import org.graalvm.word.LocationIdentity;
 
 public final class ForeignCalls {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
index 1ce399f13683..834ff062a833 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/FusedMultiplyAddNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.TernaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import jdk.compiler.graal.serviceprovider.GraalServices;
 
 @NodeInfo(cycles = CYCLES_2, size = SIZE_1)
 public final class FusedMultiplyAddNode extends TernaryNode implements ArithmeticLIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/GHASHProcessBlocksNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/GHASHProcessBlocksNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
index 1e9d17eb1d61..e50ffd434ffb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/GHASHProcessBlocksNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/HalfFloatToFloatNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/HalfFloatToFloatNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
index f0ef9c226aaf..68304f189b11 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/HalfFloatToFloatNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
index 09d7233e5da5..4d4e854f920e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/IdentityHashCodeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptBciSupplier;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/IntrinsicMethodNodeInterface.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/IntrinsicMethodNodeInterface.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
index ce8e535a498c..ba409a2c423e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/IntrinsicMethodNodeInterface.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.core.common.GraalOptions.InlineGraalStubs;
+import static jdk.compiler.graal.core.common.GraalOptions.InlineGraalStubs;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueNodeInterface;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.Architecture;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
index 7180478d65eb..03b522118e80 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/LoadSnippetVarargParameterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 /**
  * Implements the semantics of {@link VarargsParameter}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/LogNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LogNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/LogNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LogNode.java
index f43b3d8a6172..b2a22e87ac11 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/LogNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LogNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.io.PrintStream;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 /**
  * 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.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
index 7e56180387e1..e637d7392121 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroInvokable.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
@@ -22,34 +22,34 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.FixedNodeInterface;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.Invokable;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
-import org.graalvm.compiler.phases.common.GuardLoweringPhase;
-import org.graalvm.compiler.phases.common.HighTierLoweringPhase;
-import org.graalvm.compiler.phases.common.LowTierLoweringPhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.common.MidTierLoweringPhase;
-import org.graalvm.compiler.phases.common.RemoveValueProxyPhase;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
index 424b6ca6981a..bd094a80f7ff 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.InliningLog;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
index 44ed5a89729a..0b5c814b9e85 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MacroWithExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
@@ -22,30 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import static jdk.vm.ci.code.BytecodeFrame.isPlaceholderBci;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.InliningLog;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
@@ -82,7 +81,7 @@ public abstract class MacroWithExceptionNode extends WithExceptionNode implement
     @Input NodeInputList originalArguments;
 
     @SuppressWarnings("this-escape")
-    protected MacroWithExceptionNode(NodeClass c, MacroParams p) {
+    protected MacroWithExceptionNode(NodeClass c, MacroNode.MacroParams p) {
         super(c, p.returnStamp != null ? p.returnStamp.getTrustedStamp() : null);
         this.arguments = new NodeInputList<>(this, p.arguments);
         this.bci = p.bci;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MemoryKillStubIntrinsicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MemoryKillStubIntrinsicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
index 5017b3e6c9a9..df98ccf3a9b9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MemoryKillStubIntrinsicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+import static jdk.compiler.graal.nodeinfo.InputType.Memory;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.AbstractMemoryCheckpoint;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MessageDigestNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MessageDigestNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
index b7fb5aa82d19..ec8223c7778e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MessageDigestNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_128;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_256;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+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 java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
index 627151b38df7..c089e1111cb1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MethodHandleNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
@@ -22,43 +22,44 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.lang.invoke.MethodHandle;
 import java.util.Arrays;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.Assumptions.AssumptionResult;
@@ -130,8 +131,8 @@ public GraphAdder(StructuredGraph graph) {
         }
 
         /**
-         * Call {@link StructuredGraph#addOrUnique(org.graalvm.compiler.graph.Node)} on {@code node}
-         * and link any {@link FixedWithNextNode}s into the current control flow.
+         * Call {@link StructuredGraph#addOrUnique(Node)} on {@code node} and link any
+         * {@link FixedWithNextNode}s into the current control flow.
          *
          * @return the newly added node
          */
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MethodHandleWithExceptionNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MethodHandleWithExceptionNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
index d371bde9b6cb..8d05d4f7adf1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/MethodHandleWithExceptionNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
@@ -22,22 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.lang.invoke.MethodHandle;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
-import org.graalvm.compiler.replacements.nodes.MethodHandleNode.GraphAdder;
+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.vm.ci.meta.MethodHandleAccessProvider;
 import jdk.vm.ci.meta.MethodHandleAccessProvider.IntrinsicMethod;
@@ -51,7 +49,7 @@ public final class MethodHandleWithExceptionNode extends MacroWithExceptionNode
 
     protected final IntrinsicMethod intrinsicMethod;
 
-    public MethodHandleWithExceptionNode(IntrinsicMethod intrinsicMethod, MacroParams p) {
+    public MethodHandleWithExceptionNode(IntrinsicMethod intrinsicMethod, MacroNode.MacroParams p) {
         super(TYPE, p);
         this.intrinsicMethod = intrinsicMethod;
     }
@@ -65,7 +63,7 @@ public void simplify(SimplifierTool tool) {
     public WithExceptionNode trySimplify(MethodHandleAccessProvider methodHandleAccess) {
         ValueNode[] argumentsArray = arguments.toArray(new ValueNode[arguments.size()]);
 
-        GraphAdder adder = MethodHandleNode.getGraphAdderBeforeNode(this);
+        MethodHandleNode.GraphAdder adder = MethodHandleNode.getGraphAdderBeforeNode(this);
         MethodHandleNode.InvokeFactory invokeFactory = (callTarget, bi, stmp) -> {
             InvokeWithExceptionNode invoke = new InvokeWithExceptionNode(callTarget, null, bi);
             invoke.setStamp(stmp);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ObjectClone.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ObjectClone.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
index fb2099fb21e6..b368dc76c03b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ObjectClone.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.Collections;
 
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.ConstantReflectionProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
index 70b78633644c..d700a3851fe0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ProfileBooleanNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
-import static org.graalvm.compiler.nodes.util.ConstantReflectionUtil.loadIntArrayConstant;
+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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.DeoptimizationAction;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
index 5385a443fcc8..9f7322f0ceaf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/PureFunctionMacroNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/PureFunctionStubIntrinsicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/PureFunctionStubIntrinsicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
index 18cf0dd44ddc..ee4dc6362b49 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/PureFunctionStubIntrinsicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
+import static jdk.compiler.graal.nodeinfo.InputType.Memory;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
index 9458b71d62dd..344207209eaa 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReadRegisterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.Register;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
index b268d28e865a..90d5a4fa22ce 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReflectionGetCallerClassNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
index 6968b7232254..27bedd73f654 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.lang.invoke.MethodHandle;
 
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReverseBitsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReverseBitsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
index a1d2b06d9e93..4ab9aabf0a86 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReverseBitsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_32;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_32;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_32;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_32;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
index ff6267f5325a..3054b3a18edd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ReverseBytesNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
index 83905a9ac2fd..2cc51f47222a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/UnaryMathIntrinsicNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.common.type.FloatStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 import jdk.vm.ci.meta.JavaKind;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VectorizedHashCodeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VectorizedHashCodeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
index fe5b8bc0b76a..58fd4ecf9933 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VectorizedHashCodeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.Pointer;
 
 import jdk.vm.ci.amd64.AMD64;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VectorizedMismatchNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VectorizedMismatchNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
index 97d626430423..dbcbd692cf69 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VectorizedMismatchNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
 import java.util.EnumSet;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.GenerateStub;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
index b697e8951c41..9fd6545ff2f7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/VirtualizableInvokeMacroNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 /**
  * A helper class to allow elimination of byte code instrumentation that could interfere with escape
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
index 54c373fe877b..8b9cf9879834 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/WriteRegisterNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.code.Register;
 import jdk.vm.ci.meta.Value;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
index f93fa39fb0e8..96c260ad2a3c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/ZeroMemoryNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes;
+package jdk.compiler.graal.replacements.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_8;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.word.Word;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
index 7e7724968306..73988a502dc2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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;
 
 @NodeInfo
 public abstract class BinaryIntegerExactArithmeticSplitNode extends IntegerExactArithmeticSplitNode implements IterableNodeType {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
index f936df6a6819..aa08eb151aff 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
index 98902077f10e..c20231823b46 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
@@ -23,23 +23,23 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable.BinaryCommutative;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
index 58c72c342f2f..04be0a11d852 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.Value;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
index 54fd57711d87..1f406dce9238 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
 public interface IntegerExactArithmeticNode {
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
index f502e303ecd8..04fc5c513e56 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
index 8fbf7b4dd857..610123b2e531 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
@@ -23,25 +23,25 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
+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 java.util.List;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
index 5f3756b536fa..23cd5371b4e2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
index 87643cbace3b..fd70b5597502 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
index f7e5d97d7ce0..7079e7a5ff6b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
index d468dc862ef1..941cb9e12fe4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
similarity index 81%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
index 9f20f430ef79..e9d155480be4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
@@ -23,27 +23,27 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
 import java.util.List;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
index 9e6e25ebb87c..58690865d801 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.NegateNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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.vm.ci.meta.Value;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
index 92cee0e9165c..6501f0e6ae6d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
index 0b27f17c9510..15174d8e071b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
@@ -23,22 +23,22 @@
  * questions.
  */
 
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
index 430ecba497fa..36d02f35f0f2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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.vm.ci.meta.Value;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.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.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
index 1c28cfa053f4..ed031b003ccc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/replacements/nodes/arithmetic/UnsignedMulHighNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
@@ -22,24 +22,24 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.replacements.nodes.arithmetic;
+package jdk.compiler.graal.replacements.nodes.arithmetic;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp;
-import org.graalvm.compiler.core.common.type.ArithmeticOpTable.BinaryOp.UMulHigh;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.BinaryArithmeticNode;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/runtime/RuntimeProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/runtime/RuntimeProvider.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/runtime/RuntimeProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/runtime/RuntimeProvider.java
index 69700a8a11a1..7259f8e9ed1a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/runtime/RuntimeProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/runtime/RuntimeProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.runtime;
+package jdk.compiler.graal.runtime;
 
 import jdk.vm.ci.code.Architecture;
 
-import org.graalvm.compiler.core.target.Backend;
+import jdk.compiler.graal.core.target.Backend;
 
 /**
  * A runtime supporting a host backend as well, zero or more additional backends.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GlobalAtomicLong.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GlobalAtomicLong.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
index c59d95771d57..fa57acd15371 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GlobalAtomicLong.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.lang.ref.Cleaner;
 import java.util.concurrent.atomic.AtomicLong;
@@ -79,7 +79,7 @@ public String toString() {
         }
     }
 
-    // Substituted by Target_org_graalvm_compiler_serviceprovider_GlobalAtomicLong
+    // Substituted by Target_jdk_compiler_graal_serviceprovider_GlobalAtomicLong
     private long getAddress() {
         if (address == 0L) {
             synchronized (this) {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GraalServices.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalServices.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GraalServices.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalServices.java
index e54c8a71ed0c..6026f1e9a1f9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GraalServices.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalServices.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import static java.lang.Thread.currentThread;
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
@@ -509,6 +509,6 @@ public static boolean hasLookupMethodWithCaller() {
      */
     public static void notifyLowMemoryPoint(@SuppressWarnings("unused") boolean fullGC) {
         // Substituted by
-        // com.oracle.svm.hotspot.libgraal.Target_org_graalvm_compiler_serviceprovider_GraalServices
+        // com.oracle.svm.hotspot.libgraal.Target_jdk_compiler_graal_serviceprovider_GraalServices
     }
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
index 3658842638c3..26cd896d7797 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/GraalUnsafeAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.lang.reflect.Field;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/IsolateUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/IsolateUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
index c91bc3bbff1c..fddd5d062560 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/IsolateUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.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_org_graalvm_compiler_serviceprovider_IsolateUtil
+        // com.oracle.svm.graal.Target_jdk_compiler_graal_serviceprovider_IsolateUtil
         return 0;
     }
 
@@ -45,7 +45,7 @@ public static long getIsolateAddress() {
      */
     public static long getIsolateID() {
         // Substituted by
-        // com.oracle.svm.graal.Target_org_graalvm_compiler_serviceprovider_IsolateUtil
+        // com.oracle.svm.graal.Target_jdk_compiler_graal_serviceprovider_IsolateUtil
         return 0;
     }
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/JMXService.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JMXService.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/JMXService.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JMXService.java
index ef9b2d5bea48..24751f4ef23d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/JMXService.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JMXService.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.util.List;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
index 8bd4593148a8..41c97a16cd4c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/JavaVersionUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.lang.Runtime.Version;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/OWNERS.toml b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/OWNERS.toml
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
index 1d66aef5d1a4..74c9bf323a32 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/ServiceProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/SpeculationEncodingAdapter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/SpeculationEncodingAdapter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
index 488bd1791b4f..47eb4ead7205 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/SpeculationEncodingAdapter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.util.ArrayList;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/SpeculationReasonGroup.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/SpeculationReasonGroup.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
index 11f0837e75ba..c62fd082195f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/SpeculationReasonGroup.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.util.Arrays;
 import java.util.HashSet;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/UnencodedSpeculationReason.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/UnencodedSpeculationReason.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
index 34be47ce07ca..12b6ba729e81 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/serviceprovider/UnencodedSpeculationReason.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.serviceprovider;
+package jdk.compiler.graal.serviceprovider;
 
 import java.util.Arrays;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/OWNERS.toml b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/OWNERS.toml
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/AbstractKnownTruffleTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/AbstractKnownTruffleTypes.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
index 72ff0ae5c2fd..aa2de90bf242 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/AbstractKnownTruffleTypes.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -31,7 +31,7 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.debug.GraalError;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/AbstractTruffleCompilationSupport.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/AbstractTruffleCompilationSupport.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
index d0aebf3c8b12..0200666aad78 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/AbstractTruffleCompilationSupport.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import com.oracle.truffle.compiler.TruffleCompilationSupport;
 import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/CommunityPartialEvaluatorConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
index be162f28dea6..659356612c05 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
 @ServiceProvider(PartialEvaluatorConfiguration.class)
 public class CommunityPartialEvaluatorConfiguration implements PartialEvaluatorConfiguration {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/EconomyPartialEvaluatorConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
index 9459d9a3acb1..cf793815a824 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
 @ServiceProvider(PartialEvaluatorConfiguration.class)
 public class EconomyPartialEvaluatorConfiguration implements PartialEvaluatorConfiguration {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
index b358a5150a5c..f81ebcfcd30f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/ExpansionStatistics.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
@@ -40,19 +40,18 @@
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.graph.SourceLanguagePosition;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.CompilationTier;
+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 com.oracle.truffle.compiler.TruffleCompilable;
 
@@ -63,25 +62,25 @@
 
 final class ExpansionStatistics {
 
-    private final Set enabledStages = new HashSet<>();
+    private final Set enabledStages = new HashSet<>();
     private final PartialEvaluator partialEvaluator;
     private volatile TruffleCompilable previousCompilation;
-    private final Set traceMethodExpansion;
-    private final Set traceNodeExpansion;
-    private final Map> methodExpansionStatistics = new HashMap<>();
-    private final Map> nodeExpansionStatistics = new HashMap<>();
-    private final Map> specializationExpansionStatistics = new HashMap<>();
+    private final Set traceMethodExpansion;
+    private final Set traceNodeExpansion;
+    private final Map> methodExpansionStatistics = new HashMap<>();
+    private final Map> nodeExpansionStatistics = new HashMap<>();
+    private final Map> specializationExpansionStatistics = new HashMap<>();
 
     private ExpansionStatistics(PartialEvaluator partialEvaluator,
-                    Set traceMethodExpansion, Set traceNodeExpansion,
-                    Set methodExpansionStatistics, Set nodeExpansionStatistics) {
+                    Set traceMethodExpansion, Set traceNodeExpansion,
+                    Set methodExpansionStatistics, Set nodeExpansionStatistics) {
         this.partialEvaluator = partialEvaluator;
         this.traceMethodExpansion = traceMethodExpansion;
         this.traceNodeExpansion = traceNodeExpansion;
-        for (CompilationTier tier : methodExpansionStatistics) {
+        for (TruffleCompilerOptions.CompilationTier tier : methodExpansionStatistics) {
             this.methodExpansionStatistics.put(tier, new HashMap<>());
         }
-        for (CompilationTier tier : nodeExpansionStatistics) {
+        for (TruffleCompilerOptions.CompilationTier tier : nodeExpansionStatistics) {
             this.nodeExpansionStatistics.put(tier, new HashMap<>());
         }
         this.enabledStages.addAll(traceMethodExpansion);
@@ -94,19 +93,19 @@ static ExpansionStatistics create(PartialEvaluator partialEvaluator, OptionValue
         if (!isEnabled(options)) {
             return null;
         }
-        Set traceMethodExpansion = TruffleCompilerOptions.TraceMethodExpansion.getValue(options).tiers();
-        Set traceNodeExpansion = TruffleCompilerOptions.TraceNodeExpansion.getValue(options).tiers();
-        Set methodExpansionStatistics = TruffleCompilerOptions.MethodExpansionStatistics.getValue(options).tiers();
-        Set nodeExpansionStatistics = TruffleCompilerOptions.NodeExpansionStatistics.getValue(options).tiers();
+        Set traceMethodExpansion = TruffleCompilerOptions.TraceMethodExpansion.getValue(options).tiers();
+        Set traceNodeExpansion = TruffleCompilerOptions.TraceNodeExpansion.getValue(options).tiers();
+        Set methodExpansionStatistics = TruffleCompilerOptions.MethodExpansionStatistics.getValue(options).tiers();
+        Set nodeExpansionStatistics = TruffleCompilerOptions.NodeExpansionStatistics.getValue(options).tiers();
 
         return new ExpansionStatistics(partialEvaluator, traceMethodExpansion, traceNodeExpansion, methodExpansionStatistics, nodeExpansionStatistics);
     }
 
     static boolean isEnabled(OptionValues options) {
-        Set traceMethodExpansion = TruffleCompilerOptions.TraceMethodExpansion.getValue(options).tiers();
-        Set traceNodeExpansion = TruffleCompilerOptions.TraceNodeExpansion.getValue(options).tiers();
-        Set methodExpansionStatistics = TruffleCompilerOptions.MethodExpansionStatistics.getValue(options).tiers();
-        Set nodeExpansionStatistics = TruffleCompilerOptions.NodeExpansionStatistics.getValue(options).tiers();
+        Set traceMethodExpansion = TruffleCompilerOptions.TraceMethodExpansion.getValue(options).tiers();
+        Set traceNodeExpansion = TruffleCompilerOptions.TraceNodeExpansion.getValue(options).tiers();
+        Set methodExpansionStatistics = TruffleCompilerOptions.MethodExpansionStatistics.getValue(options).tiers();
+        Set nodeExpansionStatistics = TruffleCompilerOptions.NodeExpansionStatistics.getValue(options).tiers();
 
         if (!traceMethodExpansion.isEmpty() ||
                         !traceNodeExpansion.isEmpty() ||
@@ -119,18 +118,18 @@ static boolean isEnabled(OptionValues options) {
 
     void afterPartialEvaluation(TruffleCompilable compilable, StructuredGraph graph) {
         this.previousCompilation = compilable;
-        handleStage(compilable, graph, CompilationTier.peTier);
+        handleStage(compilable, graph, TruffleCompilerOptions.CompilationTier.peTier);
     }
 
     void afterTruffleTier(TruffleCompilable compilable, StructuredGraph graph) {
-        handleStage(compilable, graph, CompilationTier.truffleTier);
+        handleStage(compilable, graph, TruffleCompilerOptions.CompilationTier.truffleTier);
     }
 
     void afterLowTier(TruffleCompilable compilable, StructuredGraph graph) {
-        handleStage(compilable, graph, CompilationTier.lowTier);
+        handleStage(compilable, graph, TruffleCompilerOptions.CompilationTier.lowTier);
     }
 
-    private void handleStage(TruffleCompilable compilable, StructuredGraph graph, CompilationTier tier) {
+    private void handleStage(TruffleCompilable compilable, StructuredGraph graph, TruffleCompilerOptions.CompilationTier tier) {
         boolean methodExpansion = this.traceMethodExpansion.contains(tier);
         boolean nodeExpansion = this.traceNodeExpansion.contains(tier);
         boolean methodExpansionStat = this.methodExpansionStatistics.containsKey(tier);
@@ -190,10 +189,10 @@ void onShutdown() {
             // cannot print without any compilations
             return;
         }
-        for (Entry> statsEntry : this.methodExpansionStatistics.entrySet()) {
+        for (Entry> statsEntry : this.methodExpansionStatistics.entrySet()) {
             printHistogram(ast, statsEntry.getKey(), statsEntry.getValue(), ExpansionStatistics::formatQualifiedMethod, null, null, null, "Method");
         }
-        for (Entry> statsEntry : this.nodeExpansionStatistics.entrySet()) {
+        for (Entry> statsEntry : this.nodeExpansionStatistics.entrySet()) {
             printHistogram(ast, statsEntry.getKey(), statsEntry.getValue(), (info) -> info == null ? "no info" : info.getLabel(),
                             this.specializationExpansionStatistics.get(statsEntry.getKey()),
                             (s) -> s.getLabel(),
@@ -201,7 +200,7 @@ void onShutdown() {
         }
     }
 
-    private  void printHistogram(TruffleCompilable ast, CompilationTier tier,
+    private  void printHistogram(TruffleCompilable ast, TruffleCompilerOptions.CompilationTier tier,
                     Map statsMap, Function labelFunction,
                     Map subGroupMap, Function subGroupLabelFunction,
                     Function subGroupToGroup, String kind) {
@@ -327,7 +326,7 @@ private TreeNode resolveMethodTree(TreeNode root, NodeSourcePosition pos) {
     }
 
     @SuppressWarnings("static-method")
-    private synchronized  void combineExpansionStatistics(CompilationTier tier, Map> stats,
+    private synchronized  void combineExpansionStatistics(TruffleCompilerOptions.CompilationTier tier, Map> stats,
                     Map newStats) {
         Map methodStats = stats.get(tier);
         if (methodStats == null) {
@@ -340,7 +339,7 @@ private synchronized  void combineExpansionStatistics(CompilationTier tier, M
         }
     }
 
-    private void printExpansionTree(TruffleCompilable compilable, TreeNode tree, CompilationTier tier) {
+    private void printExpansionTree(TruffleCompilable compilable, TreeNode tree, TruffleCompilerOptions.CompilationTier tier) {
         StringWriter writer = new StringWriter();
         try (PrintWriter w = new PrintWriter(writer)) {
             tree.print(w);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/GraphTooBigBailoutException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/GraphTooBigBailoutException.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
index ca79309ef271..b1f4373c96f8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/GraphTooBigBailoutException.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.core.common.PermanentBailoutException;
+import jdk.compiler.graal.core.common.PermanentBailoutException;
 
 @SuppressWarnings("serial")
 public final class GraphTooBigBailoutException extends PermanentBailoutException {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/KnownTruffleTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/KnownTruffleTypes.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
index 36870879a8d2..4e299d6f68da 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/KnownTruffleTypes.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.ref.Reference;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PEAgnosticInlineInvokePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PEAgnosticInlineInvokePlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
index 410066689529..8c171756df32 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PEAgnosticInlineInvokePlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/ParsingInlineInvokePlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/ParsingInlineInvokePlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
index bed425f860bb..747914d6ca43 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/ParsingInlineInvokePlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
-import org.graalvm.compiler.replacements.ReplacementsImpl;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
index 80b86d981fa5..d89809540ac0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
@@ -22,54 +22,48 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
-
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.EncodedGraphCache;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.ExcludeAssertions;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.MaximumGraalGraphSize;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.NodeSourcePositions;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.ParsePEGraphsWithAssumptions;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.net.URI;
 import java.nio.Buffer;
 import java.util.function.Supplier;
 
+import jdk.compiler.graal.truffle.compiler.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
+import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.SourceLanguagePosition;
-import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.CachingPEGraphDecoder;
-import org.graalvm.compiler.replacements.InlineDuringParsingPlugin;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
-import org.graalvm.compiler.replacements.ReplacementsImpl;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
-import org.graalvm.compiler.truffle.compiler.phases.DeoptimizeOnExceptionPhase;
-import org.graalvm.compiler.truffle.compiler.phases.InstrumentPhase;
-import org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import org.graalvm.compiler.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+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 com.oracle.truffle.compiler.ConstantFieldInfo;
 import com.oracle.truffle.compiler.PartialEvaluationMethodInfo;
@@ -137,18 +131,18 @@ public PartialEvaluator(TruffleCompilerConfiguration config, GraphBuilderConfigu
     protected void initialize(OptionValues options) {
         instrumentationCfg = new InstrumentPhase.InstrumentationConfiguration(options);
         boolean needSourcePositions = graphBuilderConfigPrototype.trackNodeSourcePosition() ||
-                        NodeSourcePositions.getValue(options) ||
+                        TruffleCompilerOptions.NodeSourcePositions.getValue(options) ||
                         instrumentationCfg.instrumentBranches ||
                         instrumentationCfg.instrumentBoundaries ||
                         !TruffleCompilerOptions.TracePerformanceWarnings.getValue(options).kinds().isEmpty();
 
         graphBuilderConfigForParsing = graphBuilderConfigPrototype.withNodeSourcePosition(needSourcePositions).withOmitAssertions(
-                        ExcludeAssertions.getValue(options));
+                        TruffleCompilerOptions.ExcludeAssertions.getValue(options));
 
-        this.allowAssumptionsDuringParsing = ParsePEGraphsWithAssumptions.getValue(options);
+        this.allowAssumptionsDuringParsing = TruffleCompilerOptions.ParsePEGraphsWithAssumptions.getValue(options);
         // Graphs with assumptions cannot be cached across compilations, so the persistent cache is
         // disabled if assumptions are allowed.
-        this.persistentEncodedGraphCache = EncodedGraphCache.getValue(options) && !ParsePEGraphsWithAssumptions.getValue(options);
+        this.persistentEncodedGraphCache = TruffleCompilerOptions.EncodedGraphCache.getValue(options) && !TruffleCompilerOptions.ParsePEGraphsWithAssumptions.getValue(options);
     }
 
     public abstract PartialEvaluationMethodInfo getMethodInfo(ResolvedJavaMethod method);
@@ -268,7 +262,7 @@ private static final class GraphSizeListener extends Graph.NodeEventListener {
         private int graphSize;
 
         private GraphSizeListener(OptionValues options, StructuredGraph graph) {
-            this.graphSizeLimit = MaximumGraalGraphSize.getValue(options);
+            this.graphSizeLimit = TruffleCompilerOptions.MaximumGraalGraphSize.getValue(options);
             this.graph = graph;
             this.graphSize = NodeCostUtil.computeGraphSize(graph);
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluatorConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluatorConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
index 78d14fb081d1..621046288954 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
+import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
 import jdk.vm.ci.code.Architecture;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
+import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.compiler.graal.phases.util.Providers;
+import jdk.compiler.graal.serviceprovider.GraalServices;
 
 public interface PartialEvaluatorConfiguration {
     /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PerformanceInformationHandler.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PerformanceInformationHandler.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
index 8cb5316cefc6..f8c4eedd5e63 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PerformanceInformationHandler.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
@@ -22,11 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
-
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.TracePerformanceWarnings;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.TraceStackTraceLimit;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.TreatPerformanceWarningsAsErrors;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -37,23 +33,23 @@
 import java.util.Map;
 import java.util.Set;
 
+import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.ProfileData.ProfileSource;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
+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 com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
@@ -65,26 +61,25 @@
  * This class handles reporting of performance warning.
  *
  * One instance is installed ({@link #install(TruffleCompilerRuntime,OptionValues)} for each
- * compilation before the {@link org.graalvm.compiler.truffle.compiler.phases.TruffleTier} and
- * closed after.
+ * compilation before the {@link TruffleTier} and closed after.
  */
 public final class PerformanceInformationHandler implements Closeable {
 
     private static final ThreadLocal instance = new ThreadLocal<>();
     private final TruffleCompilerRuntime runtime;
     private final OptionValues options;
-    private final Set warningKinds = EnumSet.noneOf(PerformanceWarningKind.class);
+    private final Set warningKinds = EnumSet.noneOf(TruffleCompilerOptions.PerformanceWarningKind.class);
 
     private PerformanceInformationHandler(TruffleCompilerRuntime runtime, OptionValues options) {
         this.options = options;
         this.runtime = runtime;
     }
 
-    private void addWarning(PerformanceWarningKind warningKind) {
+    private void addWarning(TruffleCompilerOptions.PerformanceWarningKind warningKind) {
         warningKinds.add(warningKind);
     }
 
-    private Set getWarnings() {
+    private Set getWarnings() {
         return warningKinds;
     }
 
@@ -101,13 +96,13 @@ public static PerformanceInformationHandler install(TruffleCompilerRuntime runti
         return handler;
     }
 
-    public static boolean isWarningEnabled(PerformanceWarningKind warningKind) {
+    public static boolean isWarningEnabled(TruffleCompilerOptions.PerformanceWarningKind warningKind) {
         PerformanceInformationHandler handler = instance.get();
-        return TracePerformanceWarnings.getValue(handler.options).kinds().contains(warningKind) ||
-                        TreatPerformanceWarningsAsErrors.getValue(handler.options).kinds().contains(warningKind);
+        return TruffleCompilerOptions.TracePerformanceWarnings.getValue(handler.options).kinds().contains(warningKind) ||
+                        TruffleCompilerOptions.TreatPerformanceWarningsAsErrors.getValue(handler.options).kinds().contains(warningKind);
     }
 
-    public static void logPerformanceWarning(PerformanceWarningKind warningKind, TruffleCompilable compilable, List locations, String details,
+    public static void logPerformanceWarning(TruffleCompilerOptions.PerformanceWarningKind warningKind, TruffleCompilable compilable, List locations, String details,
                     Map properties) {
         PerformanceInformationHandler handler = instance.get();
         handler.addWarning(warningKind);
@@ -126,7 +121,7 @@ private String getPerformanceStackTrace(List locations) {
         if (locations == null || locations.isEmpty()) {
             return null;
         }
-        int limit = TraceStackTraceLimit.getValue(options);
+        int limit = TruffleCompilerOptions.TraceStackTraceLimit.getValue(options);
         if (limit <= 0) {
             return null;
         }
@@ -175,7 +170,7 @@ public void reportPerformanceWarnings(TruffleTierContext context) {
         StructuredGraph graph = context.graph;
         DebugContext debug = context.debug;
         ArrayList warnings = new ArrayList<>();
-        if (isWarningEnabled(PerformanceWarningKind.VIRTUAL_RUNTIME_CALL)) {
+        if (isWarningEnabled(TruffleCompilerOptions.PerformanceWarningKind.VIRTUAL_RUNTIME_CALL)) {
             for (MethodCallTargetNode call : context.graph.getNodes(MethodCallTargetNode.TYPE)) {
                 ResolvedJavaMethod targetMethod = call.targetMethod();
                 if (targetMethod.isNative()) {
@@ -183,14 +178,14 @@ public void reportPerformanceWarnings(TruffleTierContext context) {
                 }
 
                 if (targetMethod.canBeInlined() && context.getPartialEvaluator().getMethodInfo(targetMethod).inlineForPartialEvaluation().allowsInlining()) {
-                    logPerformanceWarning(PerformanceWarningKind.VIRTUAL_RUNTIME_CALL, context.compilable, Arrays.asList(call),
+                    logPerformanceWarning(TruffleCompilerOptions.PerformanceWarningKind.VIRTUAL_RUNTIME_CALL, context.compilable, Arrays.asList(call),
                                     String.format("Partial evaluation could not inline the virtual runtime call %s to %s (%s).", call.invokeKind(), targetMethod, call),
                                     null);
                     warnings.add(call);
                 }
             }
         }
-        if (isWarningEnabled(PerformanceWarningKind.VIRTUAL_INSTANCEOF)) {
+        if (isWarningEnabled(TruffleCompilerOptions.PerformanceWarningKind.VIRTUAL_INSTANCEOF)) {
             EconomicMap> groupedByType = EconomicMap.create(Equivalence.DEFAULT);
             for (InstanceOfNode instanceOf : graph.getNodes().filter(InstanceOfNode.class)) {
                 if (!instanceOf.type().isExact()) {
@@ -212,7 +207,7 @@ public void reportPerformanceWarnings(TruffleTierContext context) {
                 logPerformanceInfo(context.compilable, entry.getValue(), reason, Collections.singletonMap("Nodes", entry.getValue()));
             }
         }
-        if (isWarningEnabled(PerformanceWarningKind.MISSING_LOOP_FREQUENCY_INFO)) {
+        if (isWarningEnabled(TruffleCompilerOptions.PerformanceWarningKind.MISSING_LOOP_FREQUENCY_INFO)) {
             ControlFlowGraph cfg = ControlFlowGraph.compute(graph, true, true, true, false);
             for (Loop loop : cfg.getLoops()) {
                 // check if all loop exit contain trusted profiles
@@ -226,7 +221,7 @@ public void reportPerformanceWarnings(TruffleTierContext context) {
                     if (loopBlocks.contains(exitDom) && exitDom.getEndNode() instanceof ControlSplitNode) {
                         ControlSplitNode split = (ControlSplitNode) exitDom.getEndNode();
                         if (!ProfileSource.isTrusted(split.getProfileData().getProfileSource())) {
-                            logPerformanceWarning(PerformanceWarningKind.MISSING_LOOP_FREQUENCY_INFO, context.compilable, Arrays.asList(loop.getHeader().getBeginNode()),
+                            logPerformanceWarning(TruffleCompilerOptions.PerformanceWarningKind.MISSING_LOOP_FREQUENCY_INFO, context.compilable, Arrays.asList(loop.getHeader().getBeginNode()),
                                             String.format("Missing loop profile for %s at loop %s.", split, loop.getHeader().getBeginNode()), null);
                         }
                     }
@@ -242,7 +237,7 @@ public void reportPerformanceWarnings(TruffleTierContext context) {
             }
         }
 
-        if (!Collections.disjoint(getWarnings(), TreatPerformanceWarningsAsErrors.getValue(options).kinds())) {
+        if (!Collections.disjoint(getWarnings(), TruffleCompilerOptions.TreatPerformanceWarningsAsErrors.getValue(options).kinds())) {
             throw new AssertionError("Performance warning detected and is treated as a compilation error.");
         }
     }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PostPartialEvaluationSuite.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PostPartialEvaluationSuite.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
index e8a7f1988b84..3e030bbc168f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/PostPartialEvaluationSuite.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.truffle.compiler.phases.FrameAccessVerificationPhase;
-import org.graalvm.compiler.truffle.compiler.phases.PhiTransformPhase;
-import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
+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.compiler.phases.FrameAccessVerificationPhase;
+import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase;
+import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
 
 public class PostPartialEvaluationSuite extends PhaseSuite {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/SuppressFBWarnings.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/SuppressFBWarnings.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
index 2e1cbc8bc0ff..0d2f11a3ba56 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/SuppressFBWarnings.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleAST.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleAST.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
index 7e5d297497aa..b0304701a09a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleAST.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -31,17 +31,15 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.debug.JavaMethodContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator.SourceLanguagePositionImpl;
-import org.graalvm.compiler.truffle.compiler.phases.inlining.CallNode;
-import org.graalvm.compiler.truffle.compiler.phases.inlining.CallNode.State;
-import org.graalvm.compiler.truffle.compiler.phases.inlining.CallTree;
-import org.graalvm.graphio.GraphBlocks;
-import org.graalvm.graphio.GraphStructure;
+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.compiler.phases.inlining.CallNode;
+import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree;
+import jdk.compiler.graal.graphio.GraphBlocks;
+import jdk.compiler.graal.graphio.GraphStructure;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
@@ -132,7 +130,7 @@ private void makeInlinedAST(ASTNode parent, JavaConstant node, final ASTNode ast
                     astNode.properties.put("call." + entry.getKey().toString(), entry.getValue());
                 }
             }
-            if (found != null && found.getState() == State.Inlined) {
+            if (found != null && found.getState() == CallNode.State.Inlined) {
                 TruffleAST.ASTBlock block = makeASTBlock(parent.block, found);
                 TruffleCompilable ast = block.callNode.getDirectCallTarget();
                 buildTree(readRootNode(ast), astNode, block);
@@ -282,7 +280,7 @@ private final class ASTNode {
                 properties.put("sourceLanguage", position.getLanguage());
                 properties.put("sourceDescription", position.getDescription());
                 properties.put("nodeSourcePosition",
-                                new NodeSourcePosition(new SourceLanguagePositionImpl(position), null, types().OptimizedCallTarget_profiledPERoot, -1));
+                                new NodeSourcePosition(new PartialEvaluator.SourceLanguagePositionImpl(position), null, types().OptimizedCallTarget_profiledPERoot, -1));
             }
             this.properties.putAll(task.getDebugProperties(node));
             block.nodes.add(this);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilation.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilation.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
index 1cee2c3f0dee..f82a8818ed78 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilation.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.function.Consumer;
 
-import org.graalvm.compiler.debug.LogStream;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.LogStream;
+import jdk.compiler.graal.debug.TTY;
+import jdk.compiler.graal.nodes.StructuredGraph;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilationIdentifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilationIdentifier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
index c8aa4d7929e6..a8b4a78b40c8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilationIdentifier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.core.common.CompilationIdentifier;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
index c24610873306..c64dfb33a187 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.phases.tiers.Suites;
+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 com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
index ecd1c19f05f8..22d8c765e07e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
@@ -22,18 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI;
-import static org.graalvm.compiler.core.CompilationWrapper.ExceptionAction.Diagnose;
-import static org.graalvm.compiler.core.common.CompilationRequestIdentifier.asCompilationRequest;
-import static org.graalvm.compiler.phases.OptimisticOptimizations.ALL;
-import static org.graalvm.compiler.phases.OptimisticOptimizations.Optimization.RemoveNeverExecutedCode;
-import static org.graalvm.compiler.phases.OptimisticOptimizations.Optimization.UseExceptionProbability;
-import static org.graalvm.compiler.phases.OptimisticOptimizations.Optimization.UseTypeCheckHints;
-import static org.graalvm.compiler.phases.OptimisticOptimizations.Optimization.UseTypeCheckedInlining;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.ExcludeAssertions;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.IterativePartialEscape;
+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 java.io.PrintStream;
 import java.util.ArrayList;
@@ -43,55 +41,55 @@
 import java.util.Map;
 import java.util.function.Consumer;
 
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode;
+import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption;
+import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
+import jdk.compiler.graal.truffle.compiler.phases.InstrumentationSuite;
+import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.CompilationPrinter;
-import org.graalvm.compiler.core.CompilationWatchDog;
-import org.graalvm.compiler.core.CompilationWrapper;
-import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction;
-import org.graalvm.compiler.core.GraalCompiler;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.CompilationIdentifier.Verbosity;
-import org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugContext.Scope;
-import org.graalvm.compiler.debug.DebugDumpScope;
-import org.graalvm.compiler.debug.DiagnosticsOutputDirectory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.debug.LogStream;
-import org.graalvm.compiler.debug.MemUseTrackerKey;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.options.OptionsParser;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilation.TTYToPolyglotLoggerBridge;
-import org.graalvm.compiler.truffle.compiler.nodes.AnyExtendNode;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleAssumption;
-import org.graalvm.compiler.truffle.compiler.phases.InstrumentPhase;
-import org.graalvm.compiler.truffle.compiler.phases.InstrumentationSuite;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleTier;
+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 com.oracle.truffle.compiler.OptimizedAssumptionDependency;
 import com.oracle.truffle.compiler.TruffleCompilable;
@@ -149,7 +147,7 @@ public TruffleCompilerImpl(TruffleCompilerConfiguration config) {
         GraphBuilderConfiguration baseConfig = GraphBuilderConfiguration.getDefault(new Plugins(this.config.plugins()));
         this.builderConfig = baseConfig //
                         .withSkippedExceptionTypes(config.types().skippedExceptionTypes) //
-                        .withOmitAssertions(ExcludeAssertions.getDefaultValue()) //
+                        .withOmitAssertions(TruffleCompilerOptions.ExcludeAssertions.getDefaultValue()) //
                         .withBytecodeExceptionMode(BytecodeExceptionMode.ExplicitOnly) //
                         // Avoid deopt loops caused by unresolved constant pool entries when parsed
                         // graphs are cached across compilations.
@@ -291,7 +289,7 @@ public void initialize(TruffleCompilable compilable, boolean firstInitialization
         if (!initialized) {
             synchronized (this) {
                 if (!initialized) {
-                    try (TTY.Filter ttyFilter = new TTY.Filter(new LogStream(new TTYToPolyglotLoggerBridge(config.runtime(), compilable)))) {
+                    try (TTY.Filter ttyFilter = new TTY.Filter(new LogStream(new TruffleCompilation.TTYToPolyglotLoggerBridge(config.runtime(), compilable)))) {
                         OptionValues compilerOptions = getOrCreateCompilerOptions(compilable);
 
                         partialEvaluator.initialize(compilerOptions);
@@ -311,7 +309,7 @@ public void initialize(TruffleCompilable compilable, boolean firstInitialization
     protected TruffleTier newTruffleTier(OptionValues options) {
         return new TruffleTier(options, partialEvaluator,
                         new InstrumentationSuite(partialEvaluator.instrumentationCfg, config.snippetReflection(), partialEvaluator.getInstrumentation()),
-                        new PostPartialEvaluationSuite(options, IterativePartialEscape.getValue(options)));
+                        new PostPartialEvaluationSuite(options, TruffleCompilerOptions.IterativePartialEscape.getValue(options)));
     }
 
     /**
@@ -387,7 +385,7 @@ public int getNodeCount() {
         public String[] getNodeTypes(boolean simpleNames) {
             String[] res = new String[graph.getNodeCount()];
             int i = 0;
-            for (org.graalvm.compiler.graph.Node node : graph.getNodes()) {
+            for (Node node : graph.getNodes()) {
                 res[i++] = simpleNames ? node.getClass().getSimpleName() : node.getClass().getName();
             }
             return res;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerOptions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerOptions.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
index e407f7d81981..5454280cf3a3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleCompilerOptions.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -31,14 +31,14 @@
 import java.util.Set;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionGroup;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.options.OptionsParser;
+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 com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor;
 import com.oracle.truffle.compiler.TruffleCompilerOptionDescriptor.Type;
@@ -317,7 +317,7 @@ private static String indent(int nameLength) {
     public static TruffleCompilerOptionDescriptor[] listOptions() {
         List convertedDescriptors = new ArrayList<>();
 
-        for (org.graalvm.compiler.options.OptionDescriptor descriptor : TruffleCompilerImpl.OPTION_DESCRIPTORS) {
+        for (OptionDescriptor descriptor : TruffleCompilerImpl.OPTION_DESCRIPTORS) {
             convertedDescriptors.add(createCompilerOptionDescriptor(descriptor));
         }
         return convertedDescriptors.toArray(new TruffleCompilerOptionDescriptor[convertedDescriptors.size()]);
@@ -359,7 +359,7 @@ static OptionValues updateValues(OptionValues graalOptions) {
     }
 
     public static String validateOption(String key, String uncheckedValue) {
-        org.graalvm.compiler.options.OptionDescriptor descriptor = TruffleCompilerImpl.OPTION_DESCRIPTORS.get(key);
+        OptionDescriptor descriptor = TruffleCompilerImpl.OPTION_DESCRIPTORS.get(key);
         if (descriptor == null) {
             return "Option with key '" + key + "' not found.";
         }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleConstantFieldProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleConstantFieldProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
index 4d2c1d7d280b..c18a24e1580d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleConstantFieldProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleDebugHandlersFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleDebugHandlersFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
index 40221a94a3cb..d4a3db1d27e9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleDebugHandlersFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.io.IOException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugDumpHandler;
-import org.graalvm.compiler.debug.DebugHandler;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.DebugOptions.PrintGraphTarget;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
-import org.graalvm.graphio.GraphOutput;
+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;
 
 @ServiceProvider(DebugHandlersFactory.class)
 public class TruffleDebugHandlersFactory implements DebugHandlersFactory {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleDebugJavaMethod.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleDebugJavaMethod.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
index c834c9b0201d..f31f002155bb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleDebugJavaMethod.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleElementCache.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleElementCache.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
index 692271dee98b..3c11920b5461 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleElementCache.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
-import org.graalvm.compiler.core.common.util.MethodKey;
+import jdk.compiler.graal.core.common.util.MethodKey;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleInliningScope.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleInliningScope.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
index c1d4849b0837..47bfb51b4e7c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleInliningScope.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.io.Closeable;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.truffle.compiler.phases.inlining.CallTree;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.truffle.compiler.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.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleStringConstantFieldProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleStringConstantFieldProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
index f2a1a0007ab7..511a8ff89f3d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleStringConstantFieldProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
+import jdk.compiler.graal.phases.util.Providers;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.MetaAccessProvider;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
index 15bb2d751b7c..5af707b99d8e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleCompilerPhases;
+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.compiler.phases.TruffleCompilerPhases;
 
 public final class TruffleTierConfiguration {
     private final PartialEvaluatorConfiguration configuration;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierContext.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierContext.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
index 9eead2621437..9bde66f1c7b9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/TruffleTierContext.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler;
+package jdk.compiler.graal.truffle.compiler;
 
 import java.util.Objects;
 
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.Cancellable;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleAssumption;
+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.compiler.nodes.TruffleAssumption;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/HostInliningPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/HostInliningPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
index 7648a02bfab0..8825bc1ca702 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/HostInliningPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.host;
+package jdk.compiler.graal.truffle.compiler.host;
 
-import static org.graalvm.compiler.core.common.GraalOptions.Intrinsify;
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
+import static jdk.compiler.graal.core.common.GraalOptions.Intrinsify;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.phases.HighTier;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.AbstractInliningPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
+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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
index d35cd262a178..34577bafd547 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.host;
+package jdk.compiler.graal.truffle.compiler.host;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.HighTierLoweringPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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.vm.ci.meta.ResolvedJavaField;
 import jdk.vm.ci.meta.ResolvedJavaType;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleHostEnvironment.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleHostEnvironment.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
index 1b96b1db947e..ee142582fd83 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleHostEnvironment.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.host;
+package jdk.compiler.graal.truffle.compiler.host;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleKnownHostTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleKnownHostTypes.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
index 3d0e364b03c4..887c51f464a9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/TruffleKnownHostTypes.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.host;
+package jdk.compiler.graal.truffle.compiler.host;
 
-import org.graalvm.compiler.truffle.compiler.AbstractKnownTruffleTypes;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.AbstractKnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
index 8c170711ced4..f22268e0c3b3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotPartialEvaluator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
index 41963f1f8d22..e7b0e3ea10d1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.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 org.graalvm.compiler.core.common.util.FieldKey;
-import org.graalvm.compiler.core.common.util.MethodKey;
-import org.graalvm.compiler.hotspot.HotSpotGraalServices;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleElementCache;
+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.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
 
 import com.oracle.truffle.compiler.ConstantFieldInfo;
 import com.oracle.truffle.compiler.PartialEvaluationMethodInfo;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
index 35b7f255e04a..b8f4634de8d5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import org.graalvm.compiler.hotspot.HotSpotCompilationIdentifier;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.hotspot.HotSpotCompilationIdentifier;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
index 2f346e4c7cde..a9e5f8cdbea7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
@@ -22,13 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import org.graalvm.compiler.hotspot.CompilerConfigurationFactory;
-import org.graalvm.compiler.hotspot.HotSpotGraalOptionValues;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.AbstractTruffleCompilationSupport;
-import org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl.Options;
+import jdk.compiler.graal.hotspot.CompilerConfigurationFactory;
+import jdk.compiler.graal.hotspot.HotSpotGraalOptionValues;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.truffle.compiler.AbstractTruffleCompilationSupport;
 
 import com.oracle.truffle.compiler.TruffleCompiler;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
@@ -53,7 +52,7 @@ public String getCompilerConfigurationName(TruffleCompilerRuntime truffleRuntime
 
     public static String getLazyCompilerConfigurationName() {
         final OptionValues options = HotSpotGraalOptionValues.defaultOptions();
-        String factoryName = Options.TruffleCompilerConfiguration.getValue(options);
+        String factoryName = HotSpotTruffleCompilerImpl.Options.TruffleCompilerConfiguration.getValue(options);
         HotSpotJVMCIRuntime runtime = HotSpotJVMCIRuntime.runtime();
         CompilerConfigurationFactory compilerConfigurationFactory = CompilerConfigurationFactory.selectFactory(factoryName, options, runtime);
         return compilerConfigurationFactory.getName();
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
index 90de6c0336d6..51ecc721e859 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import static org.graalvm.compiler.core.GraalCompiler.compileGraph;
-import static org.graalvm.compiler.debug.DebugOptions.DebugStubsAndSnippets;
-import static org.graalvm.compiler.hotspot.meta.HotSpotSuitesProvider.withNodeSourcePosition;
+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 java.io.PrintStream;
 import java.util.ArrayList;
@@ -34,60 +34,60 @@
 import java.util.ListIterator;
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Activation;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.DiagnosticsOutputDirectory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.CompilerConfigurationFactory;
-import org.graalvm.compiler.hotspot.EconomyCompilerConfigurationFactory;
-import org.graalvm.compiler.hotspot.HotSpotBackend;
-import org.graalvm.compiler.hotspot.HotSpotBackendFactory;
-import org.graalvm.compiler.hotspot.HotSpotCompilationIdentifier;
-import org.graalvm.compiler.hotspot.HotSpotCompiledCodeBuilder;
-import org.graalvm.compiler.hotspot.HotSpotGraalCompilerFactory;
-import org.graalvm.compiler.hotspot.HotSpotGraalOptionValues;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
-import org.graalvm.compiler.hotspot.HotSpotGraalServices;
-import org.graalvm.compiler.hotspot.HotSpotGraphBuilderInstance;
-import org.graalvm.compiler.hotspot.meta.HotSpotLoweringProvider;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.Speculative;
-import org.graalvm.compiler.phases.common.AbstractInliningPhase;
-import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.tiers.SuitesProvider;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluatorConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilationIdentifier;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.TruffleTierConfiguration;
-import org.graalvm.compiler.truffle.compiler.host.HostInliningPhase;
-import org.graalvm.compiler.truffle.compiler.host.InjectImmutableFrameFieldsPhase;
+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.compiler.host.InjectImmutableFrameFieldsPhase;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration;
+import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
index f073af38d9f4..a449e5c12c9a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
 import java.lang.ref.Reference;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.nodes.HotSpotLoadReservedReferenceNode;
-import org.graalvm.compiler.hotspot.nodes.HotSpotStoreReservedReferenceNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.word.WordTypes;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
index c72c3faf20b9..43a0eb527ca3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.TruffleElementCache;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 import com.oracle.truffle.compiler.TruffleCompilable;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
index c4de7b41528e..45b98339ec6c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
 import java.util.concurrent.atomic.AtomicReference;
 
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
index c67ad90e7dd5..3d5930e3b2a8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider;
-import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider.Extension;
-import org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleSafepointLoweringSnippet.TruffleHotSpotSafepointLoweringExtension;
+import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider;
+import jdk.compiler.graal.hotspot.meta.DefaultHotSpotLoweringProvider.Extension;
+import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleSafepointLoweringSnippet.TruffleHotSpotSafepointLoweringExtension;
 
 /**
  * Lowering of HotSpot Truffle specific nodes.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
index 4e889819c1e7..e054b4268621 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
@@ -22,42 +22,42 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
-
-import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Transition.SAFEPOINT;
-import static org.graalvm.compiler.hotspot.meta.HotSpotForeignCallsProviderImpl.NO_LOCATIONS;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
-
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider;
-import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor;
-import org.graalvm.compiler.hotspot.meta.HotSpotForeignCallDescriptor.Reexecutability;
-import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.nodes.CurrentJavaThreadNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleSafepointNode;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleSafepointInsertionPhase;
-import org.graalvm.compiler.word.Word;
+package jdk.compiler.graal.truffle.compiler.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.compiler.nodes.TruffleSafepointNode;
+import jdk.compiler.graal.truffle.compiler.phases.TruffleSafepointInsertionPhase;
+import jdk.compiler.graal.word.Word;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.common.NativeImageReinitialize;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
index 95a475577e8c..dd172c256ea9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
+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.compiler.TruffleCompilerConfiguration;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
index b9dd70a07f0d..1a5ffc490173 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import org.graalvm.compiler.core.phases.CommunityCompilerConfiguration;
-import org.graalvm.compiler.core.phases.HighTier;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.host.HostInliningPhase;
-import org.graalvm.compiler.truffle.compiler.host.InjectImmutableFrameFieldsPhase;
-import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins;
+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.compiler.host.InjectImmutableFrameFieldsPhase;
+import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
+import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
index 43af18082a31..578b14f355c5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import org.graalvm.compiler.hotspot.CommunityCompilerConfigurationFactory;
-import org.graalvm.compiler.hotspot.CompilerConfigurationFactory;
-import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+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;
 
 /**
  * Factory for creating the default configuration for the community edition of Graal.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleEntryPointDecorator.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
index 0f6df4dd438a..4d19cb09fa1b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.compiler.hotspot;
 
-import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
+import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntime;
-import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
+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.compiler.TruffleCompilerConfiguration;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
similarity index 74%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
index 64a8f6bb180c..731afbc49191 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
@@ -22,31 +22,31 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot.aarch64;
+package jdk.compiler.graal.truffle.compiler.hotspot.aarch64;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
 import static jdk.vm.ci.meta.JavaKind.Object;
-import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
+import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntime;
-import org.graalvm.compiler.hotspot.aarch64.AArch64HotSpotBackend;
-import org.graalvm.compiler.hotspot.aarch64.AArch64HotSpotMove;
-import org.graalvm.compiler.hotspot.aarch64.AArch64HotSpotZBarrierSetLIRGenerator;
-import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.lir.aarch64.AArch64FrameMap;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import org.graalvm.compiler.truffle.compiler.hotspot.TruffleEntryPointDecorator;
+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.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.compiler.graal.truffle.compiler.hotspot.TruffleEntryPointDecorator;
 
 import jdk.vm.ci.code.Register;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
index a05daf7a7db4..5e584aa1ab3c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
@@ -22,29 +22,29 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.hotspot.amd64;
+package jdk.compiler.graal.truffle.compiler.hotspot.amd64;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
-import static org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
+import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntime;
-import org.graalvm.compiler.hotspot.amd64.AMD64HotSpotBackend;
-import org.graalvm.compiler.hotspot.amd64.AMD64HotSpotZBarrierSetLIRGenerator;
-import org.graalvm.compiler.hotspot.meta.HotSpotRegistersProvider;
-import org.graalvm.compiler.lir.amd64.AMD64Move;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import org.graalvm.compiler.truffle.compiler.hotspot.TruffleEntryPointDecorator;
+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.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.compiler.graal.truffle.compiler.hotspot.TruffleEntryPointDecorator;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
 
 import jdk.vm.ci.amd64.AMD64;
 import jdk.vm.ci.code.Register;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/AnyExtendNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
similarity index 75%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/AnyExtendNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
index 5996e3789d37..9a1fcb2426f9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/AnyExtendNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.compiler.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
 
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/IsCompilationConstantNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/IsCompilationConstantNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
index ed4298dfafe4..b7f2416bb868 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/IsCompilationConstantNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.compiler.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/ObjectLocationIdentity.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/ObjectLocationIdentity.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
index 0b22f11e17dd..24eb824409ab 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/ObjectLocationIdentity.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.compiler.nodes;
 
 import java.util.Objects;
 
-import org.graalvm.compiler.nodes.util.JavaConstantFormattable;
-import org.graalvm.compiler.nodes.util.JavaConstantFormatter;
+import jdk.compiler.graal.nodes.util.JavaConstantFormattable;
+import jdk.compiler.graal.nodes.util.JavaConstantFormatter;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
index 7f949dfdbf72..47eedc5bcbd8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.compiler.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
+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.compiler.PartialEvaluator;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/TruffleAssumption.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/TruffleAssumption.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
index 2ebf331e4367..cbce066453e3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/TruffleAssumption.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.compiler.nodes;
 
 import jdk.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/TruffleSafepointNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/TruffleSafepointNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
index 7f1b6ef2f17c..1930c39a8c34 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/TruffleSafepointNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.compiler.nodes;
 
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
 import java.util.Objects;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 @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.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
similarity index 78%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
index 8cbbb1624afe..e39e5f1e849f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.asserts;
+package jdk.compiler.graal.truffle.compiler.nodes.asserts;
 
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class NeverPartOfCompilationNode extends ControlSinkNode implements StateSplit, IterableNodeType {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/AllowMaterializeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
similarity index 77%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/AllowMaterializeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
index 29bc62269b73..ff1d472acf84 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/AllowMaterializeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
@@ -22,20 +22,20 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 /**
  * Intrinsic node for materializing a Truffle frame.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/ForceMaterializeNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
similarity index 76%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/ForceMaterializeNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
index 1e8982985ed6..761618c66df8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/ForceMaterializeNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class ForceMaterializeNode extends FixedWithNextNode implements LIRLowerable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/NewFrameNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/NewFrameNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
index 38ecb9e74379..4a6fdcf21726 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/NewFrameNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
@@ -22,40 +22,40 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+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.compiler.KnownTruffleTypes;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
index 15fc6f0832b2..eb8c3e946cfb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
 public enum VirtualFrameAccessFlags {
     // Does not access the frame storage (getTag / isX)
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessType.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
index 9deba29ccfd1..fba9a04a9935 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
 public enum VirtualFrameAccessType {
     Indexed,
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
index b42c25588ba6..6dfb387e0491 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
@@ -23,13 +23,13 @@
  * questions.
  */
 
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import org.graalvm.compiler.nodes.ValueNodeInterface;
+import jdk.compiler.graal.nodes.ValueNodeInterface;
+import jdk.compiler.graal.truffle.compiler.phases.FrameAccessVerificationPhase;
 
 /**
- * Interface used to update the frame verification state in
- * {@link org.graalvm.compiler.truffle.compiler.phases.FrameAccessVerificationPhase}.
+ * Interface used to update the frame verification state in {@link FrameAccessVerificationPhase}.
  * 

  * Since the verification phase only verify coherent frames at merges, this interface does not
  * perform tag or access checks, it only provides the state to the phase.
@@ -45,9 +45,8 @@ public interface VirtualFrameAccessVerificationNode extends ValueNodeInterface {
      * Frame accesses that modify the frame should implement this method to update the given
      * {@code state} using the given {@code updater}.
      * 

-     * Due to how the
-     * {@link org.graalvm.compiler.truffle.compiler.phases.FrameAccessVerificationPhase verification
-     * phase} works, accesses that do not modify the frame can provide a void implementation.
+     * Due to how the {@link FrameAccessVerificationPhase verification phase} works, accesses that
+     * do not modify the frame can provide a void implementation.
      *
      * @see VirtualFrameCopyNode#updateVerificationState(VirtualFrameVerificationStateUpdater,
      *      Object)
@@ -58,8 +57,7 @@ public interface VirtualFrameAccessVerificationNode extends ValueNodeInterface {
 
     /**
      * Provides control over a given state representation of a virtual frame during
-     * {@link org.graalvm.compiler.truffle.compiler.phases.FrameAccessVerificationPhase frame
-     * verification}.
+     * {@link FrameAccessVerificationPhase frame verification}.
      */
     interface VirtualFrameVerificationStateUpdater {
         void set(State state, int slot, byte tag);
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
index 96e6adddcee6..6e152eff2e6b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
+package jdk.compiler.graal.truffle.compiler.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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameClearNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
index 25fa71feacc7..cf9237ef478b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
@@ -23,21 +23,21 @@
  * questions.
  */
 
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
index d2d35ca6cbcc..1a20f47d3a16 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class VirtualFrameCopyNode extends VirtualFrameAccessorNode implements Virtualizable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameGetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
index 178b74bee7f2..11969a845d96 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+package jdk.compiler.graal.truffle.compiler.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;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
index 62d2b71d10db..5fed7bebadea 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameIsNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
similarity index 79%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
index 14455ee49f22..df334380022c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
@@ -22,22 +22,22 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameSetNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
index 482ef407bd05..356124d0f47f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
@@ -22,25 +22,25 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
-
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+package jdk.compiler.graal.truffle.compiler.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;
 
 import jdk.vm.ci.meta.JavaKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
index c6e04885e082..b85c9d9dca8c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.compiler.nodes.frame;
 
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
+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;
 
 @NodeInfo(cycles = CYCLES_0, size = SIZE_0)
 public final class VirtualFrameSwapNode extends VirtualFrameAccessorNode implements Virtualizable {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
index 6867365929bf..9ea147c5d7d8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
 import java.util.function.Predicate;
 
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.truffle.compiler.nodes.SpeculativeExceptionAnchorNode;
+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.compiler.nodes.SpeculativeExceptionAnchorNode;
 
 import jdk.vm.ci.meta.DeoptimizationAction;
 import jdk.vm.ci.meta.DeoptimizationReason;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/FrameAccessVerificationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/FrameAccessVerificationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
index 37c4641cadac..90fa7078a95a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/FrameAccessVerificationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -35,34 +35,34 @@
 import java.util.Map;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.LoopInfo;
-import org.graalvm.compiler.phases.graph.ReentrantNodeIterator.NodeIteratorClosure;
-import org.graalvm.compiler.truffle.compiler.PerformanceInformationHandler;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.NewFrameNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameAccessFlags;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameAccessType;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameAccessVerificationNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameSetNode;
+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.compiler.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessFlags;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessType;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessVerificationNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSetNode;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
index 65de31ee72aa..8dcc553609f9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.nodes.java.MethodCallTargetNode;
+import jdk.compiler.graal.phases.BasePhase;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentBranchesPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentBranchesPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
index ca289159e0f7..6bbf6c8388d1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentBranchesPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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.vm.ci.meta.JavaConstant;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 /**
  * Instruments {@link IfNode}s in the graph, by adding execution counters to the true and the false
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
index 540a3fb617ba..531f32db6edb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentBoundaries;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentBranches;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentBranchesPerInlineSite;
-import static org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.InstrumentationTableSize;
+import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBoundaries;
+import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite;
+import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBranches;
+import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBranchesPerInlineSite;
+import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentationTableSize;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;
@@ -38,25 +38,25 @@
 import java.util.List;
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 import jdk.vm.ci.code.CodeUtil;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
index 76e9c74376db..a6a29569ac94 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+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.compiler.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime.InlineKind;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentationSuite.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentationSuite.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
index 35c27941d379..8c26de145240 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/InstrumentationSuite.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.phases.PhaseSuite;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 public class InstrumentationSuite extends PhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/MaterializeFramesPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/MaterializeFramesPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
index 1475dd86d35b..fb18f6df0dcb 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/MaterializeFramesPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.AllowMaterializeNode;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.phases.BasePhase;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.AllowMaterializeNode;
 
 public final class MaterializeFramesPhase extends BasePhase {
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/NeverPartOfCompilationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/NeverPartOfCompilationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
index 6b19b592adef..3baa7c543a85 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/NeverPartOfCompilationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.core.common.GraalBailoutException;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
-import org.graalvm.compiler.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode;
+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.compiler.nodes.asserts.NeverPartOfCompilationNode;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 public final class NeverPartOfCompilationPhase extends BasePhase {
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/PhiTransformPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/PhiTransformPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
index da2edbafbeea..440ee442ecbf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/PhiTransformPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
@@ -23,35 +23,35 @@
  * questions.
  */
 
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Graph.NodeEvent;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.calc.IntegerConvertNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.UnaryNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectState;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
-import org.graalvm.compiler.truffle.compiler.nodes.AnyExtendNode;
+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.compiler.nodes.AnyExtendNode;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/ReportPerformanceWarningsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
index 7c6aec397e49..fc14a1ea8c85 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.phases.BasePhase;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 public final class ReportPerformanceWarningsPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/SetIdentityForValueTypesPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
index faa762d36a8a..ecb96191632e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+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.compiler.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleCompilerPhases.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleCompilerPhases.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
index f4a62e4c5928..e39d4a120950 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleCompilerPhases.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
@@ -22,17 +22,17 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
 import java.util.ListIterator;
 
-import org.graalvm.compiler.loop.phases.LoopSafepointEliminationPhase;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+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.compiler.KnownTruffleTypes;
 
 public final class TruffleCompilerPhases {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
index b8b086042d26..abfa8689de07 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.loop.phases.LoopSafepointEliminationPhase;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.loop.LoopEx;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+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.compiler.KnownTruffleTypes;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleSafepointInsertionPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
index 66d24978044a..3c5f76c321cc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.NodeWithState;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilation;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleSafepointNode;
+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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
+import jdk.compiler.graal.truffle.compiler.nodes.TruffleSafepointNode;
 
 import jdk.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.ResolvedJavaField;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleTier.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
similarity index 80%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleTier.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
index caf744c89d91..fab7c19f6242 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/TruffleTier.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.core.phases.BaseTier;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.PostPartialEvaluationSuite;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
-import org.graalvm.compiler.truffle.compiler.phases.inlining.AgnosticInliningPhase;
+import jdk.compiler.graal.core.phases.BaseTier;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase;
 
 public class TruffleTier extends BaseTier {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
similarity index 83%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
index 2a28adfc7c87..427662b77049 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.compiler.phases;
 
-import org.graalvm.compiler.graph.GraalGraphError;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.NewFrameNode;
+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.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.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.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/AgnosticInliningPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
index 8b851e6aa895..eb5c43baf4c7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Objects;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.util.GraphOrder;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.PostPartialEvaluationSuite;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.TruffleInliningScope;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+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.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleInliningScope;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 public final class AgnosticInliningPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
index e37c852c0b58..e09306bde051 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.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 org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSuccessorList;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil.InlineeReturnAction;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
-import org.graalvm.compiler.truffle.compiler.PerformanceInformationHandler;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
+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.compiler.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
 
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallTree.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallTree.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
index 03dcba628f3c..a9f2c761b473 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallTree.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
-
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.PostPartialEvaluationSuite;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
+
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.graph.Graph;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilationTask;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/DefaultInliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
index f1bb518676f4..66733c06adf4 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
 import java.util.Comparator;
 import java.util.Map;
 import java.util.PriorityQueue;
 
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
 
 final class DefaultInliningPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
index 408b345c8485..fd3985f6adc3 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
 @ServiceProvider(InliningPolicyProvider.class)
 public class DefaultInliningPolicyProvider extends InliningPolicyProvider {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/GraphManager.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
similarity index 86%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/GraphManager.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
index 979d0aa40f3e..5e6ebc9aec75 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/GraphManager.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Scope;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.contract.NodeCostUtil;
-import org.graalvm.compiler.truffle.compiler.PEAgnosticInlineInvokePlugin;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.PostPartialEvaluationSuite;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.TruffleDebugJavaMethod;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleAssumption;
+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.compiler.PEAgnosticInlineInvokePlugin;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod;
+import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/InliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/InliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
index afab5f588814..6adcdd85c894 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/InliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
 
 @SuppressWarnings("unused")
 public interface InliningPolicy {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/InliningPolicyProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/InliningPolicyProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
index 180dfd70b226..6f68e77b0f6e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/InliningPolicyProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.compiler.graal.options.OptionValues;
 
 public abstract class InliningPolicyProvider implements Comparable {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/NoInliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/NoInliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
index 3787b405dd53..22665f1b94f9 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/NoInliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
 final class NoInliningPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
index 123c0fcc8c9c..8e4db31f86a8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
 @ServiceProvider(InliningPolicyProvider.class)
 public class NoInliningPolicyProvider extends InliningPolicyProvider {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
index e0010ade5f19..12d8af1eeb53 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
 
 final class TrivialOnlyInliningPolicy implements InliningPolicy {
     private final OptionValues options;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
similarity index 88%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
index 1a1dd6609268..93019d388967 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.compiler.phases.inlining;
 
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.nodes.spi.CoreProviders;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
 @ServiceProvider(InliningPolicyProvider.class)
 public class TrivialOnlyPolicyProvider extends InliningPolicyProvider {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
index 76cee0b2ea62..db7c785269c2 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.compiler.substitutions;
 
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.compiler.graal.phases.util.Providers;
+import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
similarity index 91%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
index 6191ea351fad..62779462a274 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.compiler.substitutions;
 
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.compiler.graal.phases.util.Providers;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
index d0acd37af99f..3672988688c1 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.compiler.substitutions;
 
 import static java.lang.Character.toUpperCase;
-import static org.graalvm.compiler.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool.RoundingMode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConditionAnchorNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.DynamicPiNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiArrayNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerMulHighNode;
-import org.graalvm.compiler.nodes.calc.RoundNode;
-import org.graalvm.compiler.nodes.debug.BlackholeNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.GuardedUnsafeLoadNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.ResolvedJavaSymbol;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.arithmetic.UnsignedMulHighNode;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
-import org.graalvm.compiler.truffle.compiler.PerformanceInformationHandler;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilation;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
-import org.graalvm.compiler.truffle.compiler.TruffleDebugJavaMethod;
-import org.graalvm.compiler.truffle.compiler.nodes.AnyExtendNode;
-import org.graalvm.compiler.truffle.compiler.nodes.IsCompilationConstantNode;
-import org.graalvm.compiler.truffle.compiler.nodes.ObjectLocationIdentity;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleAssumption;
-import org.graalvm.compiler.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.AllowMaterializeNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.ForceMaterializeNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.NewFrameNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameAccessFlags;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameAccessType;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameClearNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameCopyNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameGetNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameGetTagNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameIsNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameSetNode;
-import org.graalvm.compiler.truffle.compiler.nodes.frame.VirtualFrameSwapNode;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleSafepointInsertionPhase;
+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.compiler.nodes.asserts.NeverPartOfCompilationNode;
+import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod;
+import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode;
+import jdk.compiler.graal.truffle.compiler.nodes.IsCompilationConstantNode;
+import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
+import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.AllowMaterializeNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.ForceMaterializeNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessFlags;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessType;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameClearNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameCopyNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameGetNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameGetTagNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameIsNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSetNode;
+import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSwapNode;
+import jdk.compiler.graal.truffle.compiler.phases.TruffleSafepointInsertionPhase;
 import org.graalvm.word.LocationIdentity;
 
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/TruffleInvocationPlugins.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/TruffleInvocationPlugins.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
index 61fcd7a3860f..325ce88e7d0d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/substitutions/TruffleInvocationPlugins.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
@@ -22,38 +22,38 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.compiler.substitutions;
 
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.BMP;
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.LATIN1;
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_16;
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_32;
-import static org.graalvm.compiler.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.UTF_8;
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.getArrayLocation;
+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 org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.StrideUtil;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool.ArrayIndexOfVariant;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.InlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.OptionalLazySymbol;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfMacroNode;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
-import org.graalvm.compiler.replacements.nodes.CalcStringAttributesMacroNode;
-import org.graalvm.compiler.replacements.nodes.MacroNode;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.aarch64.AArch64;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/CollectionsUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/CollectionsUtil.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/CollectionsUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/CollectionsUtil.java
index 0ac90a2d0e7a..0f73a6d3ef75 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/CollectionsUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/CollectionsUtil.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util;
+package jdk.compiler.graal.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/OptionsEncoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/OptionsEncoder.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/OptionsEncoder.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/OptionsEncoder.java
index a0ce6a7b5f58..ac981273cfdf 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/OptionsEncoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/OptionsEncoder.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util;
+package jdk.compiler.graal.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/TypedDataInputStream.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataInputStream.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/TypedDataInputStream.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataInputStream.java
index 1edb22fa77ee..2f5e49aefafc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/TypedDataInputStream.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataInputStream.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util;
+package jdk.compiler.graal.util;
 
 import java.io.DataInputStream;
 import java.io.IOException;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/TypedDataOutputStream.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataOutputStream.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/TypedDataOutputStream.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataOutputStream.java
index 3872ef6cdb5f..d6b607bf4162 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/TypedDataOutputStream.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataOutputStream.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util;
+package jdk.compiler.graal.util;
 
 import java.io.DataOutputStream;
 import java.io.IOException;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONFormatter.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONFormatter.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONFormatter.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONFormatter.java
index ff4d5bf48c87..04e4747418db 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONFormatter.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONFormatter.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util.json;
+package jdk.compiler.graal.util.json;
 
 import java.util.List;
 import java.util.Map;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONParser.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParser.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONParser.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParser.java
index 69eb37c90f9b..54506784734c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONParser.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParser.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util.json;
+package jdk.compiler.graal.util.json;
 
 import java.io.IOException;
 import java.io.Reader;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONParserException.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParserException.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONParserException.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParserException.java
index e3783f29ef1a..65782e97b41d 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/util/json/JSONParserException.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParserException.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.util.json;
+package jdk.compiler.graal.util.json;
 
 @SuppressWarnings("serial")
 public final class JSONParserException extends RuntimeException {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
index 0417346ab816..8597fd444dd6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectList.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
@@ -22,18 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.function.Consumer;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.OptimizationLog;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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;
 
 /**
  * An {@link EffectList} can be used to maintain a list of {@link Effect}s and backtrack to a
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
similarity index 95%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
index f4ef3a900bc1..74bc808e3afe 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsBlockState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableMapCursor;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
+import jdk.compiler.graal.nodes.WithExceptionNode;
+import jdk.compiler.graal.nodes.cfg.HIRBlock;
 
 public abstract class EffectsBlockState> {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
index 0cf788c7081f..d6afccb4de5f 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsClosure.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator.BlockIteratorClosure;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator.LoopInfo;
+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 org.graalvm.word.LocationIdentity;
 
 public abstract class EffectsClosure> extends EffectsPhase.Closure {
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
similarity index 82%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
index aa3ca30ca3f8..6e62e08eb500 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/EffectsPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.phases.common.DeadCodeEliminationPhase.Optionality.Required;
+import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Required;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Graph.NodeEventScope;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
-import org.graalvm.compiler.phases.common.util.EconomicSetNodeEventListener;
-import org.graalvm.compiler.phases.common.util.LoopUtility;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
+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;
 
 public abstract class EffectsPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/FinalPartialEscapePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/FinalPartialEscapePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
index ac3be0e15a89..eee0da3b089c 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/FinalPartialEscapePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
@@ -22,19 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.EscapeAnalyzeOnly;
+import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalyzeOnly;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
+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;
 
 /**
  * Performs the final {@link PartialEscapePhase}.
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
index 2a82deb92442..0e70251e6ec0 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/GraphEffectList.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import java.util.ArrayList;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.EscapeObjectState;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectState;
-import org.graalvm.compiler.phases.common.DeadCodeEliminationPhase;
+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;
 
 public final class GraphEffectList extends EffectList {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
index 473ac2146b25..c3c7a0381f56 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ObjectState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import java.util.Arrays;
 import java.util.List;
 
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.virtual.EscapeObjectState;
-import org.graalvm.compiler.nodes.virtual.LockState;
-import org.graalvm.compiler.nodes.virtual.MaterializedObjectState;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectState;
+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.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
index b7d5f260d3aa..514558dd5998 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationBlockState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import java.util.Iterator;
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
index 81526ee94ea8..08ffe0c15f44 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PEReadEliminationClosure.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
-import static org.graalvm.compiler.nodes.NamedLocationIdentity.ARRAY_LENGTH_LOCATION;
+import static jdk.compiler.graal.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.extended.UnboxNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.virtual.phases.ea.PEReadEliminationBlockState.ReadCacheEntry;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
similarity index 94%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
index 7b4c54bdeb1a..d28bf5e073ab 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeBlockState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
@@ -22,28 +22,28 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.LockState;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.virtual.phases.ea.EffectList.Effect;
+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;
 
 public abstract class PartialEscapeBlockState> extends EffectsBlockState {
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
similarity index 96%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
index 9b4521af51d7..29441a36d58e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapeClosure.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.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 org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.RetryableBailoutException;
-import org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.Position;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.NodeWithState;
-import org.graalvm.compiler.nodes.spi.Virtualizable;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.EnsureVirtualizedNode;
-import org.graalvm.compiler.nodes.virtual.EscapeObjectState;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectState;
+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.vm.ci.meta.JavaConstant;
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
index 337c27fe2b7f..469fe2af33bd 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/PartialEscapePhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.EscapeAnalysisIterations;
-import static org.graalvm.compiler.core.common.GraalOptions.EscapeAnalyzeOnly;
+import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalysisIterations;
+import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalyzeOnly;
 
 import java.util.Optional;
 
 import org.graalvm.collections.EconomicSet;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.VirtualizableAllocation;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
+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;
 
 /**
  * Performs Partial Escape analysis on a
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
index 624e8a88eb41..3ce53c04f7ec 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationBlockState.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
 import java.util.Iterator;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.nodes.ValueNode;
 import org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
index c232be3b792c..1f734db7f565 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationClosure.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.ReadEliminationMaxLoopVisits;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.cfg.Loop;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ProxyNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.ValueProxyNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.extended.GuardedNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.MultiMemoryKill;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.virtual.phases.ea.ReadEliminationBlockState.CacheEntry;
-import org.graalvm.compiler.virtual.phases.ea.ReadEliminationBlockState.LoadCacheEntry;
-import org.graalvm.compiler.virtual.phases.ea.ReadEliminationBlockState.UnsafeLoadCacheEntry;
+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 org.graalvm.word.LocationIdentity;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationPhase.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
similarity index 85%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationPhase.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
index afbf595e6d28..3f53252e851e 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/ReadEliminationPhase.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.EscapeAnalyzeOnly;
+import static jdk.compiler.graal.core.common.GraalOptions.EscapeAnalyzeOnly;
 
 import java.util.Optional;
 
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.graph.ReentrantBlockIterator;
+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 org.graalvm.word.LocationIdentity;
 
 /**
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
similarity index 92%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
index 7e7872c27fed..0255602ba3fc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/VirtualUtil.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.TraceEscapeAnalysis;
+import static jdk.compiler.graal.core.common.GraalOptions.TraceEscapeAnalysis;
 
 import java.util.List;
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeFlood;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
index d01485a57520..f3cb52ebf973 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/virtual/phases/ea/VirtualizerToolImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
@@ -22,32 +22,32 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.phases.ea;
+package jdk.compiler.graal.virtual.phases.ea;
 
-import static org.graalvm.compiler.core.common.GraalOptions.MaximumEscapeAnalysisArrayLength;
+import static jdk.compiler.graal.core.common.GraalOptions.MaximumEscapeAnalysisArrayLength;
 
 import java.util.List;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.calc.UnpackEndianHalfNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.CoreProvidersDelegate;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
+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.vm.ci.meta.Assumptions;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/BarrieredAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/BarrieredAccess.java
similarity index 90%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/BarrieredAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/BarrieredAccess.java
index 89b59a5067f5..caebc55fff22 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/BarrieredAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/BarrieredAccess.java
@@ -22,10 +22,8 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
+package jdk.compiler.graal.word;
 
-import org.graalvm.compiler.word.Word.Opcode;
-import org.graalvm.compiler.word.Word.Operation;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.SignedWord;
@@ -53,7 +51,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native byte readByte(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -68,7 +66,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native char readChar(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -83,7 +81,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native short readShort(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -98,7 +96,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native int readInt(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -113,7 +111,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native long readLong(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -128,7 +126,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native float readFloat(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -143,7 +141,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native double readDouble(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -158,7 +156,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native  T readWord(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -173,7 +171,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native Object readObject(Object object, WordBase offset, LocationIdentity locationIdentity);
 
     /**
@@ -184,7 +182,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native byte readByte(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -195,7 +193,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native char readChar(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -206,7 +204,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native short readShort(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -217,7 +215,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native int readInt(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -228,7 +226,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native long readLong(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -239,7 +237,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native float readFloat(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -250,7 +248,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native double readDouble(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -261,7 +259,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native  T readWord(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -272,7 +270,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the read
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native Object readObject(Object object, int offset, LocationIdentity locationIdentity);
 
     /**
@@ -287,7 +285,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeByte(Object object, WordBase offset, byte val, LocationIdentity locationIdentity);
 
     /**
@@ -302,7 +300,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeChar(Object object, WordBase offset, char val, LocationIdentity locationIdentity);
 
     /**
@@ -317,7 +315,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeShort(Object object, WordBase offset, short val, LocationIdentity locationIdentity);
 
     /**
@@ -332,7 +330,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeInt(Object object, WordBase offset, int val, LocationIdentity locationIdentity);
 
     /**
@@ -347,7 +345,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeLong(Object object, WordBase offset, long val, LocationIdentity locationIdentity);
 
     /**
@@ -362,7 +360,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeFloat(Object object, WordBase offset, float val, LocationIdentity locationIdentity);
 
     /**
@@ -377,7 +375,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeDouble(Object object, WordBase offset, double val, LocationIdentity locationIdentity);
 
     /**
@@ -392,7 +390,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeWord(Object object, WordBase offset, WordBase val, LocationIdentity locationIdentity);
 
     /**
@@ -407,7 +405,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeObject(Object object, WordBase offset, Object val, LocationIdentity locationIdentity);
 
     /**
@@ -418,7 +416,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeByte(Object object, int offset, byte val, LocationIdentity locationIdentity);
 
     /**
@@ -429,7 +427,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeChar(Object object, int offset, char val, LocationIdentity locationIdentity);
 
     /**
@@ -440,7 +438,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeShort(Object object, int offset, short val, LocationIdentity locationIdentity);
 
     /**
@@ -451,7 +449,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeInt(Object object, int offset, int val, LocationIdentity locationIdentity);
 
     /**
@@ -462,7 +460,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeLong(Object object, int offset, long val, LocationIdentity locationIdentity);
 
     /**
@@ -473,7 +471,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeFloat(Object object, int offset, float val, LocationIdentity locationIdentity);
 
     /**
@@ -484,7 +482,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeDouble(Object object, int offset, double val, LocationIdentity locationIdentity);
 
     /**
@@ -495,7 +493,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeWord(Object object, int offset, WordBase val, LocationIdentity locationIdentity);
 
     /**
@@ -506,7 +504,7 @@ public final class BarrieredAccess {
      * @param locationIdentity the identity of the write
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeObject(Object object, int offset, Object val, LocationIdentity locationIdentity);
 
     /**
@@ -520,7 +518,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native byte readByte(Object object, WordBase offset);
 
     /**
@@ -534,7 +532,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native char readChar(Object object, WordBase offset);
 
     /**
@@ -548,7 +546,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native short readShort(Object object, WordBase offset);
 
     /**
@@ -562,7 +560,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native int readInt(Object object, WordBase offset);
 
     /**
@@ -576,7 +574,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native long readLong(Object object, WordBase offset);
 
     /**
@@ -590,7 +588,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native float readFloat(Object object, WordBase offset);
 
     /**
@@ -604,7 +602,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native double readDouble(Object object, WordBase offset);
 
     /**
@@ -618,7 +616,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native  T readWord(Object object, WordBase offset);
 
     /**
@@ -632,7 +630,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native Object readObject(Object object, WordBase offset);
 
     /**
@@ -642,7 +640,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native byte readByte(Object object, int offset);
 
     /**
@@ -652,7 +650,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native char readChar(Object object, int offset);
 
     /**
@@ -662,7 +660,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native short readShort(Object object, int offset);
 
     /**
@@ -672,7 +670,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native int readInt(Object object, int offset);
 
     /**
@@ -682,7 +680,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native long readLong(Object object, int offset);
 
     /**
@@ -692,7 +690,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native float readFloat(Object object, int offset);
 
     /**
@@ -702,7 +700,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native double readDouble(Object object, int offset);
 
     /**
@@ -712,7 +710,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native  T readWord(Object object, int offset);
 
     /**
@@ -722,7 +720,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED)
     public static native Object readObject(Object object, int offset);
 
     /**
@@ -736,7 +734,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeByte(Object object, WordBase offset, byte val);
 
     /**
@@ -750,7 +748,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeChar(Object object, WordBase offset, char val);
 
     /**
@@ -764,7 +762,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeShort(Object object, WordBase offset, short val);
 
     /**
@@ -778,7 +776,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeInt(Object object, WordBase offset, int val);
 
     /**
@@ -792,7 +790,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeLong(Object object, WordBase offset, long val);
 
     /**
@@ -806,7 +804,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeFloat(Object object, WordBase offset, float val);
 
     /**
@@ -820,7 +818,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeDouble(Object object, WordBase offset, double val);
 
     /**
@@ -834,7 +832,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeWord(Object object, WordBase offset, WordBase val);
 
     /**
@@ -848,7 +846,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeObject(Object object, WordBase offset, Object val);
 
     /**
@@ -858,7 +856,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeByte(Object object, int offset, byte val);
 
     /**
@@ -868,7 +866,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeChar(Object object, int offset, char val);
 
     /**
@@ -878,7 +876,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeShort(Object object, int offset, short val);
 
     /**
@@ -888,7 +886,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeInt(Object object, int offset, int val);
 
     /**
@@ -898,7 +896,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeLong(Object object, int offset, long val);
 
     /**
@@ -908,7 +906,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeFloat(Object object, int offset, float val);
 
     /**
@@ -918,7 +916,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeDouble(Object object, int offset, double val);
 
     /**
@@ -928,7 +926,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeWord(Object object, int offset, WordBase val);
 
     /**
@@ -938,7 +936,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @param val the value to be written to memory
      */
-    @Operation(opcode = Opcode.WRITE_BARRIERED)
+    @Word.Operation(opcode = Word.Opcode.WRITE_BARRIERED)
     public static native void writeObject(Object object, int offset, Object val);
 
     /**
@@ -953,7 +951,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native byte readByteVolatile(Object object, WordBase offset);
 
     /**
@@ -968,7 +966,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native char readCharVolatile(Object object, WordBase offset);
 
     /**
@@ -983,7 +981,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native short readShortVolatile(Object object, WordBase offset);
 
     /**
@@ -998,7 +996,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native int readIntVolatile(Object object, WordBase offset);
 
     /**
@@ -1013,7 +1011,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native long readLongVolatile(Object object, WordBase offset);
 
     /**
@@ -1028,7 +1026,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native float readFloatVolatile(Object object, WordBase offset);
 
     /**
@@ -1043,7 +1041,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native double readDoubleVolatile(Object object, WordBase offset);
 
     /**
@@ -1058,7 +1056,7 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native  T readWordVolatile(Object object, WordBase offset);
 
     /**
@@ -1073,6 +1071,6 @@ public final class BarrieredAccess {
      * @param offset the signed offset for the memory access
      * @return the result of the memory access
      */
-    @Operation(opcode = Opcode.READ_BARRIERED_VOLATILE)
+    @Word.Operation(opcode = Word.Opcode.READ_BARRIERED_VOLATILE)
     public static native Object readObjectVolatile(Object object, WordBase offset);
 }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/ObjectAccess.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/ObjectAccess.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/ObjectAccess.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/ObjectAccess.java
index b72340d9223f..3fea430f81d6 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/ObjectAccess.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/ObjectAccess.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
+package jdk.compiler.graal.word;
 
-import org.graalvm.compiler.word.Word.Opcode;
-import org.graalvm.compiler.word.Word.Operation;
+import jdk.compiler.graal.word.Word.Opcode;
+import jdk.compiler.graal.word.Word.Operation;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
 import org.graalvm.word.SignedWord;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/Word.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/Word.java
similarity index 97%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/Word.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/Word.java
index b3190d43efd6..cb552c73c7cc 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/Word.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/Word.java
@@ -22,33 +22,33 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
+package jdk.compiler.graal.word;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
 import java.lang.annotation.Target;
 
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.calc.UnsignedMath;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.AndNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.OrNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
-import org.graalvm.compiler.nodes.calc.SignedDivNode;
-import org.graalvm.compiler.nodes.calc.SignedRemNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRemNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode;
-import org.graalvm.compiler.nodes.calc.XorNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode.Address;
-import org.graalvm.compiler.serviceprovider.GraalUnsafeAccess;
+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 org.graalvm.word.ComparableWord;
 import org.graalvm.word.LocationIdentity;
 import org.graalvm.word.Pointer;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordCastNode.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordCastNode.java
similarity index 87%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordCastNode.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordCastNode.java
index 0e1b850c5f20..0d0aa730969a 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordCastNode.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordCastNode.java
@@ -22,30 +22,30 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
-
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
+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;
 
 import jdk.vm.ci.meta.AllocatableValue;
 import jdk.vm.ci.meta.JavaConstant;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordOperationPlugin.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordOperationPlugin.java
similarity index 84%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordOperationPlugin.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordOperationPlugin.java
index 31b2d83c6632..e29740d688e5 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordOperationPlugin.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordOperationPlugin.java
@@ -22,60 +22,58 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
+package jdk.compiler.graal.word;
 
-import static org.graalvm.compiler.nodes.ConstantNode.forInt;
-import static org.graalvm.compiler.nodes.ConstantNode.forIntegerKind;
+import static jdk.compiler.graal.nodes.ConstantNode.forInt;
+import static jdk.compiler.graal.nodes.ConstantNode.forIntegerKind;
 import static org.graalvm.word.LocationIdentity.any;
 
 import java.lang.reflect.Constructor;
 import java.util.Arrays;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BridgeMethodUtils;
-import org.graalvm.compiler.core.common.calc.CanonicalCondition;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.calc.Condition.CanonicalizedCondition;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerBelowNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IntegerLessThanNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.XorNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.extended.JavaWriteNode;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.TypePlugin;
-import org.graalvm.compiler.nodes.java.AbstractCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.LogicCompareAndSwapNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.java.ValueCompareAndSwapNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.word.Word.Opcode;
-import org.graalvm.compiler.word.Word.Operation;
+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 org.graalvm.word.LocationIdentity;
 import org.graalvm.word.impl.WordFactoryOperation;
 
@@ -89,8 +87,8 @@
 import jdk.vm.ci.meta.ResolvedJavaType;
 
 /**
- * A plugin for calls to {@linkplain Operation word operations}, as well as all other nodes that
- * need special handling for {@link Word} types.
+ * A plugin for calls to {@linkplain Word.Operation word operations}, as well as all other nodes
+ * that need special handling for {@link Word} types.
  */
 public class WordOperationPlugin implements NodePlugin, TypePlugin, InlineInvokePlugin {
     protected final WordTypes wordTypes;
@@ -117,8 +115,8 @@ public boolean canChangeStackKind(GraphBuilderContext b) {
      * Processes a call to a method if it is annotated as a word operation by adding nodes to the
      * graph being built that implement the denoted operation.
      *
-     * @return {@code true} iff {@code method} is annotated with {@link Operation} (and was thus
-     *         processed by this method)
+     * @return {@code true} iff {@code method} is annotated with {@link Word.Operation} (and was
+     *         thus processed by this method)
      */
     @Override
     public boolean handleInvoke(GraphBuilderContext b, ResolvedJavaMethod method, ValueNode[] args) {
@@ -293,7 +291,7 @@ protected void processWordOperation(GraphBuilderContext b, ValueNode[] args, Res
                 ValueNode left = args[0];
                 ValueNode right = operation.rightOperandIsInt() ? toUnsigned(b, args[1], JavaKind.Int) : fromSigned(b, args[1]);
 
-                b.addPush(returnKind, createBinaryNodeInstance(b, operation.node(), left, right, operation.opcode() == Opcode.INTEGER_DIVISION_NODE_CLASS));
+                b.addPush(returnKind, createBinaryNodeInstance(b, operation.node(), left, right, operation.opcode() == Word.Opcode.INTEGER_DIVISION_NODE_CLASS));
                 break;
 
             case COMPARISON:
@@ -494,10 +492,10 @@ private ValueNode comparisonOp(GraphBuilderContext graph, Condition condition, V
         return graph.add(new ConditionalNode(graph.add(comparison), trueValue, falseValue));
     }
 
-    protected ValueNode readOp(GraphBuilderContext b, JavaKind readKind, AddressNode address, LocationIdentity location, Opcode op) {
-        assert op == Opcode.READ_POINTER || op == Opcode.READ_OBJECT || op == Opcode.READ_BARRIERED;
-        final BarrierType barrier = (op == Opcode.READ_BARRIERED && readKind.isObject() ? barrierSet.readBarrierType(location, address, null) : BarrierType.NONE);
-        final boolean compressible = (op == Opcode.READ_OBJECT || op == Opcode.READ_BARRIERED);
+    protected ValueNode readOp(GraphBuilderContext b, JavaKind readKind, AddressNode address, LocationIdentity location, Word.Opcode op) {
+        assert op == Word.Opcode.READ_POINTER || op == Word.Opcode.READ_OBJECT || op == Word.Opcode.READ_BARRIERED;
+        final BarrierType barrier = (op == Word.Opcode.READ_BARRIERED && readKind.isObject() ? barrierSet.readBarrierType(location, address, null) : BarrierType.NONE);
+        final boolean compressible = (op == Word.Opcode.READ_OBJECT || op == Word.Opcode.READ_BARRIERED);
 
         return readOp(b, readKind, address, location, barrier, compressible);
     }
@@ -512,10 +510,10 @@ public static ValueNode readOp(GraphBuilderContext b, JavaKind readKind, Address
         return read;
     }
 
-    protected ValueNode readVolatileOp(GraphBuilderContext b, JavaKind readKind, AddressNode address, LocationIdentity location, Opcode op) {
-        assert op == Opcode.READ_POINTER_VOLATILE || op == Opcode.READ_BARRIERED_VOLATILE;
-        final BarrierType barrier = op == Opcode.READ_BARRIERED_VOLATILE && readKind.isObject() ? barrierSet.readBarrierType(location, address, null) : BarrierType.NONE;
-        final boolean compressible = op == Opcode.READ_BARRIERED_VOLATILE;
+    protected ValueNode readVolatileOp(GraphBuilderContext b, JavaKind readKind, AddressNode address, LocationIdentity location, Word.Opcode op) {
+        assert op == Word.Opcode.READ_POINTER_VOLATILE || op == Word.Opcode.READ_BARRIERED_VOLATILE;
+        final BarrierType barrier = op == Word.Opcode.READ_BARRIERED_VOLATILE && readKind.isObject() ? barrierSet.readBarrierType(location, address, null) : BarrierType.NONE;
+        final boolean compressible = op == Word.Opcode.READ_BARRIERED_VOLATILE;
         /*
          * A JavaOrderedReadNode is lowered to an OrderedReadNode that will not float. This means it
          * cannot float above an explicit zero check on its base address or any other test that
@@ -525,15 +523,16 @@ protected ValueNode readVolatileOp(GraphBuilderContext b, JavaKind readKind, Add
         return read;
     }
 
-    protected void writeOp(GraphBuilderContext b, JavaKind writeKind, AddressNode address, LocationIdentity location, ValueNode value, Opcode op) {
-        assert op == Opcode.WRITE_POINTER || op == Opcode.WRITE_POINTER_SIDE_EFFECT_FREE || op == Opcode.WRITE_OBJECT || op == Opcode.WRITE_BARRIERED || op == Opcode.INITIALIZE ||
-                        op == Opcode.WRITE_POINTER_VOLATILE;
-        assert op != Opcode.INITIALIZE || location.isInit() : "must use init location for initializing";
+    protected void writeOp(GraphBuilderContext b, JavaKind writeKind, AddressNode address, LocationIdentity location, ValueNode value, Word.Opcode op) {
+        assert op == Word.Opcode.WRITE_POINTER || op == Word.Opcode.WRITE_POINTER_SIDE_EFFECT_FREE || op == Word.Opcode.WRITE_OBJECT || op == Word.Opcode.WRITE_BARRIERED ||
+                        op == Word.Opcode.INITIALIZE ||
+                        op == Word.Opcode.WRITE_POINTER_VOLATILE;
+        assert op != Word.Opcode.INITIALIZE || location.isInit() : "must use init location for initializing";
 
-        final BarrierType barrier = (op == Opcode.WRITE_BARRIERED ? BarrierType.UNKNOWN : BarrierType.NONE);
-        final boolean compressible = (op == Opcode.WRITE_OBJECT || op == Opcode.WRITE_BARRIERED);
-        final boolean hasSideEffect = (op != Opcode.WRITE_POINTER_SIDE_EFFECT_FREE);
-        final MemoryOrderMode memoryOrder = op == Opcode.WRITE_POINTER_VOLATILE ? MemoryOrderMode.VOLATILE : MemoryOrderMode.PLAIN;
+        final BarrierType barrier = (op == Word.Opcode.WRITE_BARRIERED ? BarrierType.UNKNOWN : BarrierType.NONE);
+        final boolean compressible = (op == Word.Opcode.WRITE_OBJECT || op == Word.Opcode.WRITE_BARRIERED);
+        final boolean hasSideEffect = (op != Word.Opcode.WRITE_POINTER_SIDE_EFFECT_FREE);
+        final MemoryOrderMode memoryOrder = op == Word.Opcode.WRITE_POINTER_VOLATILE ? MemoryOrderMode.VOLATILE : MemoryOrderMode.PLAIN;
 
         b.add(new JavaWriteNode(writeKind, address, location, value, barrier, compressible, hasSideEffect, memoryOrder));
     }
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordTypes.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordTypes.java
similarity index 89%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordTypes.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordTypes.java
index 9718a51fc5d4..e10e02034991 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordTypes.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordTypes.java
@@ -22,19 +22,18 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
+package jdk.compiler.graal.word;
 
 import static jdk.vm.ci.services.Services.IS_BUILDING_NATIVE_IMAGE;
 
-import org.graalvm.compiler.core.common.Fields;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.word.Word.Operation;
+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 org.graalvm.word.WordBase;
 import org.graalvm.word.WordFactory;
 
@@ -103,19 +102,19 @@ public boolean isWordOperation(ResolvedJavaMethod targetMethod) {
         final boolean isObjectAccess = objectAccessType.equals(targetMethod.getDeclaringClass());
         final boolean isBarrieredAccess = barrieredAccessType.equals(targetMethod.getDeclaringClass());
         if (isObjectAccess || isBarrieredAccess) {
-            assert targetMethod.getAnnotation(Operation.class) != null : targetMethod + " should be annotated with @" + Operation.class.getSimpleName();
+            assert targetMethod.getAnnotation(Word.Operation.class) != null : targetMethod + " should be annotated with @" + Word.Operation.class.getSimpleName();
             return true;
         }
         return isWord(targetMethod.getDeclaringClass());
     }
 
     /**
-     * Gets the method annotated with {@link Operation} based on a given method that represents a
-     * word operation (but may not necessarily have the annotation).
+     * Gets the method annotated with {@link Word.Operation} based on a given method that represents
+     * a word operation (but may not necessarily have the annotation).
      *
      * @param callingContextType the {@linkplain ResolvedJavaType type} from which
      *            {@code targetMethod} is invoked
-     * @return the {@link Operation} method resolved for {@code targetMethod} if any
+     * @return the {@link Word.Operation} method resolved for {@code targetMethod} if any
      */
     public ResolvedJavaMethod getWordOperation(ResolvedJavaMethod targetMethod, ResolvedJavaType callingContextType) {
         final boolean isWordBase = wordBaseType.isAssignableFrom(targetMethod.getDeclaringClass());
diff --git a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordVerificationImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordVerificationImpl.java
similarity index 93%
rename from compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordVerificationImpl.java
rename to compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordVerificationImpl.java
index eba6a5d6a61d..ef160e15d117 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/word/WordVerificationImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordVerificationImpl.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.word;
+package jdk.compiler.graal.word;
 
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.spi.WordVerification;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.nodes.spi.WordVerification;
 
 import jdk.vm.ci.meta.JavaType;
 
diff --git a/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/org/graalvm/compiler/hotspot/jdk21/test/PreviewEnabledTest.java b/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java
similarity index 87%
rename from compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/org/graalvm/compiler/hotspot/jdk21/test/PreviewEnabledTest.java
rename to compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java
index 6548748569bc..a8bf32325965 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/org/graalvm/compiler/hotspot/jdk21/test/PreviewEnabledTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.jdk21.test;
+package jdk.compiler.graal.hotspot.jdk21.test;
 
 import java.io.IOException;
 
-import org.graalvm.compiler.api.test.ModuleSupport;
-import org.graalvm.compiler.core.test.SubprocessTest;
-import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest;
-import org.graalvm.compiler.test.AddExports;
-import org.graalvm.compiler.test.SubprocessUtil;
+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 org.junit.Assume;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/org/graalvm/compiler/hotspot/jdk21/test/ScopedValueCacheTest.java b/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java
similarity index 93%
rename from compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/org/graalvm/compiler/hotspot/jdk21/test/ScopedValueCacheTest.java
rename to compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java
index 0628407df695..1cc03a4bca05 100644
--- a/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/org/graalvm/compiler/hotspot/jdk21/test/ScopedValueCacheTest.java
+++ b/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.hotspot.jdk21.test;
+package jdk.compiler.graal.hotspot.jdk21.test;
 
 import java.lang.reflect.Method;
 
-import org.graalvm.compiler.hotspot.test.HotSpotGraalCompilerTest;
-import org.graalvm.compiler.test.AddExports;
+import jdk.compiler.graal.hotspot.test.HotSpotGraalCompilerTest;
+import jdk.compiler.graal.test.AddExports;
 
 @AddExports("java.base/jdk.internal.misc")
 public class ScopedValueCacheTest extends HotSpotGraalCompilerTest {
diff --git a/compiler/src/org.graalvm.compiler.management/src/org/graalvm/compiler/management/JMXServiceProvider.java b/compiler/src/org.graalvm.compiler.management/src/jdk/compiler/graal/management/JMXServiceProvider.java
similarity index 90%
rename from compiler/src/org.graalvm.compiler.management/src/org/graalvm/compiler/management/JMXServiceProvider.java
rename to compiler/src/org.graalvm.compiler.management/src/jdk/compiler/graal/management/JMXServiceProvider.java
index 2f05a5ff3434..e798f9bf411c 100644
--- a/compiler/src/org.graalvm.compiler.management/src/org/graalvm/compiler/management/JMXServiceProvider.java
+++ b/compiler/src/org.graalvm.compiler.management/src/jdk/compiler/graal/management/JMXServiceProvider.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.management;
+package jdk.compiler.graal.management;
 
-import static org.graalvm.compiler.serviceprovider.GraalServices.getCurrentThreadId;
+import static jdk.compiler.graal.serviceprovider.GraalServices.getCurrentThreadId;
 
 import java.lang.management.ManagementFactory;
 import java.util.List;
 
-import org.graalvm.compiler.serviceprovider.JMXService;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.serviceprovider.JMXService;
+import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
 import com.sun.management.ThreadMXBean;
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java
similarity index 94%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java
index b6bc53d2f46b..cee203aa0080 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/ConditionalEliminationBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java
@@ -22,12 +22,12 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
-import org.graalvm.compiler.microbenchmarks.graal.util.GraalState;
-import org.graalvm.compiler.microbenchmarks.graal.util.GraphState;
-import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
-import org.graalvm.compiler.phases.common.ConditionalEliminationPhase;
+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 org.openjdk.jmh.annotations.Benchmark;
 
 public class ConditionalEliminationBenchmark extends GraalBenchmark {
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
similarity index 89%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
index 4f3f80702ed9..f30a327febdc 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
 import java.util.StringTokenizer;
 
 import org.openjdk.jmh.annotations.Benchmark;
 
-import org.graalvm.compiler.microbenchmarks.graal.util.FrameStateAssignmentState;
-import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
+import jdk.compiler.graal.microbenchmarks.graal.util.FrameStateAssignmentState;
+import jdk.compiler.graal.microbenchmarks.graal.util.MethodSpec;
 
 public class FrameStateAssigmentPhaseBenchmark extends GraalBenchmark {
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
similarity index 94%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
index b868b6bb5517..e7dae18012f7 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraalBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
-import org.graalvm.compiler.api.test.ModuleSupport;
+import jdk.compiler.graal.api.test.ModuleSupport;
 
 import org.openjdk.jmh.annotations.Fork;
 import org.openjdk.jmh.annotations.Measurement;
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java
similarity index 89%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java
index 0b1a0bc2f54d..48a2f6599bb8 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/GraphCopyBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java
@@ -22,18 +22,19 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
+import jdk.compiler.graal.debug.DebugContext;
 import org.openjdk.jmh.annotations.Benchmark;
 
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.microbenchmarks.graal.util.GraalState;
-import org.graalvm.compiler.microbenchmarks.graal.util.GraphState;
-import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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;
 
 /**
- * Benchmarks the performance of {@link Graph#copy(org.graalvm.compiler.debug.DebugContext)}.
+ * Benchmarks the performance of {@link Graph#copy(DebugContext)}.
  */
 public class GraphCopyBenchmark extends GraalBenchmark {
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java
similarity index 91%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java
index 55e331f95895..a8cf993d39e0 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/NodeBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java
@@ -22,23 +22,23 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
 import java.util.HashMap;
 
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.infra.Blackhole;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.microbenchmarks.graal.util.GraalState;
-import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
-import org.graalvm.compiler.microbenchmarks.graal.util.NodesState;
-import org.graalvm.compiler.microbenchmarks.graal.util.NodesState.NodePair;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 public class NodeBenchmark extends GraalBenchmark {
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java
similarity index 95%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java
index 940c0f836b55..7db0ce0f7212 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/SchedulePhaseBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
-import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
-import org.graalvm.compiler.microbenchmarks.graal.util.ScheduleState;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.phases.schedule.SchedulePhase;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
+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 org.openjdk.jmh.annotations.Benchmark;
 
 public class SchedulePhaseBenchmark extends GraalBenchmark {
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java
similarity index 93%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java
index fd6dc4ba5365..1a3986319dd3 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/TestJMHWhitebox.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal;
+package jdk.compiler.graal.microbenchmarks.graal;
 
-import org.graalvm.compiler.microbenchmarks.graal.util.GraalState;
+import jdk.compiler.graal.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/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java
similarity index 87%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java
index 3dac19790e8b..709d1eb4abfe 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/FrameStateAssignmentState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java
@@ -22,11 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
-import org.graalvm.compiler.phases.common.GuardLoweringPhase;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.phases.common.FrameStateAssignmentPhase;
+import jdk.compiler.graal.phases.common.GuardLoweringPhase;
 
 public class FrameStateAssignmentState extends GraphState {
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java
similarity index 83%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java
index 1f8229ed95b8..945a911aa81c 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java
@@ -22,15 +22,15 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
-import org.graalvm.compiler.api.test.Graal;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.runtime.RuntimeProvider;
+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 org.openjdk.jmh.annotations.Scope;
 import org.openjdk.jmh.annotations.State;
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java
similarity index 90%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java
index 51a8a2aa2e9e..59e17424bde9 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraalUtil.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java
@@ -22,21 +22,21 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
 import java.lang.reflect.Method;
 import java.util.List;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java
similarity index 88%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java
index 25edd3390d02..e51fd449ded5 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/GraphState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
-import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getGraph;
-import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec;
+import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getGraph;
+import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec;
 
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.core.common.util.CompilationAlarm;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java
similarity index 97%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java
index 2192dfb0f574..2aa5d1923769 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/MethodSpec.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java
similarity index 90%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java
index d5e157be4794..c710a492b4f9 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/NodesState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
-import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getGraphFromMethodSpec;
-import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getNodes;
+import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getGraphFromMethodSpec;
+import static jdk.compiler.graal.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 org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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;
 
 /**
  * State providing the nodes in a graph. Subclasses of this class are annotated with
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java
similarity index 86%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java
index 922ba078d580..9d7357e0c7d1 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/graal/util/ScheduleState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java
@@ -22,13 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.graal.util;
+package jdk.compiler.graal.microbenchmarks.graal.util;
 
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.schedule.SchedulePhase.SchedulingStrategy;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
+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;
 
 public class ScheduleState extends GraphState {
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java
similarity index 91%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java
index 1396053e2e8b..3804d603e30e 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/CompileTimeBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.lir;
+package jdk.compiler.graal.microbenchmarks.lir;
 
+import jdk.compiler.graal.microbenchmarks.graal.GraalBenchmark;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Param;
 
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.nodes.StructuredGraph;
 
 public class CompileTimeBenchmark extends GraalBenchmark {
 
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java
similarity index 87%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java
index fdcc111476c8..4ac94c1ca336 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/GraalCompilerState.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.lir;
+package jdk.compiler.graal.microbenchmarks.lir;
 
-import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getGraph;
-import static org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil.getMethodFromMethodSpec;
+import static jdk.compiler.graal.microbenchmarks.graal.util.GraalUtil.getGraph;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.api.test.Graal;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.GraalCompiler;
-import org.graalvm.compiler.core.GraalCompiler.Request;
-import org.graalvm.compiler.core.LIRGenerationPhase;
-import org.graalvm.compiler.core.LIRGenerationPhase.LIRGenerationContext;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.alloc.LinearScanOrder;
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.core.common.cfg.CodeEmissionOrder;
-import org.graalvm.compiler.core.gen.LIRCompilerBackend;
-import org.graalvm.compiler.core.gen.LIRGenerationProvider;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.phases.AllocationPhase.AllocationContext;
-import org.graalvm.compiler.lir.phases.LIRPhase;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase.PostAllocationOptimizationContext;
-import org.graalvm.compiler.lir.phases.PreAllocationOptimizationPhase.PreAllocationOptimizationContext;
-import org.graalvm.compiler.microbenchmarks.graal.util.GraalState;
-import org.graalvm.compiler.microbenchmarks.graal.util.GraalUtil;
-import org.graalvm.compiler.microbenchmarks.graal.util.MethodSpec;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.ScheduleResult;
-import org.graalvm.compiler.nodes.cfg.ControlFlowGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.tiers.TargetProvider;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.runtime.RuntimeProvider;
+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 org.openjdk.jmh.annotations.Level;
 import org.openjdk.jmh.annotations.Param;
 import org.openjdk.jmh.annotations.Scope;
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
similarity index 90%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
rename to compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
index f4839a2d956a..1b60f04fccd8 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/org/graalvm/compiler/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
+++ b/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
@@ -22,10 +22,10 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.microbenchmarks.lir;
+package jdk.compiler.graal.microbenchmarks.lir;
 
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark;
+import jdk.compiler.graal.lir.gen.LIRGenerationResult;
+import jdk.compiler.graal.microbenchmarks.graal.GraalBenchmark;
 import org.openjdk.jmh.annotations.Benchmark;
 import org.openjdk.jmh.annotations.Param;
 
diff --git a/compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/org/graalvm/compiler/truffle/test/LoomUtils.java b/compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java
similarity index 97%
rename from compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/org/graalvm/compiler/truffle/test/LoomUtils.java
rename to compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java
index 0542be618c01..55cceaab2496 100644
--- a/compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/org/graalvm/compiler/truffle/test/LoomUtils.java
+++ b/compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.truffle.test;
+package jdk.compiler.graal.truffle.test;
 
 public class LoomUtils {
 
diff --git a/compiler/src/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java b/compiler/src/org.graalvm.compiler.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java
similarity index 95%
rename from compiler/src/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java
rename to compiler/src/org.graalvm.compiler.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java
index 089daf53a0f4..c61dc6e06609 100644
--- a/compiler/src/org.graalvm.compiler.virtual.bench/src/org/graalvm/compiler/virtual/bench/PartialEscapeBench.java
+++ b/compiler/src/org.graalvm.compiler.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java
@@ -22,14 +22,14 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package org.graalvm.compiler.virtual.bench;
+package jdk.compiler.graal.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 org.graalvm.compiler.microbenchmarks.graal.GraalBenchmark;
+import jdk.compiler.graal.microbenchmarks.graal.GraalBenchmark;
 
 public class PartialEscapeBench extends GraalBenchmark {
 
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 c0c42adce092..8f8fc7883654 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 org.graalvm.compiler namespace so that they
- * will be subject to Graal compilation even if {@code -Dgraal.CompileGraalWithC1Only=true}.
+ * This package contains micro benchmarks outside the jdk.compiler.graal 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 00b415d9956c..11ea77302ade 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 org.graalvm.compiler.nodes.OptimizationLogImpl;
+import jdk.compiler.graal.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 f42c8a041b72..ff3cad5204dc 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 org.graalvm.compiler.nodes.OptimizationLogImpl;
+import jdk.compiler.graal.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 6cf1e9ce4e1c..5b65dfb12a9e 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 org.graalvm.util.json.JSONFormatter;
+import jdk.compiler.graal.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 87b6a1f532c3..cddddd59575c 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 org.graalvm.compiler.java.StableMethodNameFormatter;
+import jdk.compiler.graal.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 d1cffb1e2cb5..94685414d583 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 org.graalvm.util.CollectionsUtil;
+import jdk.compiler.graal.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 a8ad330a4bfb..2009f0577faa 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 org.graalvm.compiler.nodes.OptimizationLogImpl;
+import jdk.compiler.graal.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 886dff69d92d..923fb89c4c67 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 org.graalvm.util.json.JSONParser;
-import org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.util.json.JSONParser;
+import jdk.compiler.graal.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 a76d6a1952b2..3ddd67571974 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 org.graalvm.compiler.nodes.OptimizationLogImpl;
+import jdk.compiler.graal.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 ca428027c58c..f552ec9e48c2 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 org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
-j  org.graalvm.compiler.core.gen.NodeLIRBuilder.doBlock(Lorg/graalvm/compiler/nodes/cfg/Block;Lorg/graalvm/compiler/nodes/StructuredGraph;Lorg/graalvm/compiler/core/common/cfg/BlockMap;)V+211
-j  org.graalvm.compiler.core.LIRGenerationPhase.emitBlock(Lorg/graalvm/compiler/nodes/spi/NodeLIRBuilderTool;Lorg/graalvm/compiler/lir/gen/LIRGenerationResult;Lorg/graalvm/compiler/nodes/cfg/Block;Lorg/graalvm/compiler/nodes/StructuredGraph;Lorg/graalvm/compiler/core/common/cfg/BlockMap;)V+65
+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
 ```
 
 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
-org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V
+jdk.compiler.graal.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 org.graalvm.compiler.core.gen.NodeLIRBuilder.matchComplexExpressions(Ljava/util/List;)V (299 bytes) @ 0x0000000108a2fc01 [0x0000000108a2fac0+0x141] (null)
+# J 761 JVMCI jdk.compiler.graal.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        Lorg/graalvm/compiler/core/amd64/AMD64NodeLIRBuilder;                  peephole                                      (Lorg/graalvm/compiler/nodes/ValueNode;)Z           |   87ms   428B   447B  1834kB
-HotSpotCompilation-1212        Lorg/graalvm/compiler/lir/LIRInstructionClass;                         forEachState                                  (Lorg/graalvm/compiler/lir/LIRInstruction;Lorg/graalvm/compiler/lir/InstructionValueProcedure;)V  |  359ms    92B   309B  6609kB
-HotSpotCompilation-1221        Lorg/graalvm/compiler/hotspot/amd64/AMD64HotSpotLIRGenerator;          getResult                                     ()Lorg/graalvm/compiler/hotspot/HotSpotLIRGenerationResult;  |   54ms    18B   142B  1025kB
+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
 #
 # A fatal error has been detected by the Java Runtime Environment:
 #
@@ -128,7 +128,7 @@ HotSpotCompilation-1221        Lorg/graalvm/compiler/hotspot/amd64/AMD64HotSpotL
 # 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 org.graalvm.compiler.hotspot.amd64.AMD64HotSpotLIRGenerator.getResult()Lorg/graalvm/compiler/hotspot/HotSpotLIRGenerationResult; (18 bytes) @ 0x000000010a6cafb1 [0x000000010a6caf60+0x51] (null)
+# J 1221 JVMCI jdk.compiler.graal.hotspot.amd64.AMD64HotSpotLIRGenerator.getResult()Ljdk.compiler.graal/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 eafc3f8eb180..18a5211dcec8 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](https://github.com/oracle/graal/blob/master/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/core/phases/CEOptimization.java).
+Find some of the platform-independent compiler optimizations in GraalVM Community Edition [here](../../../compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java).
 
-The Graal compiler can bring performance advantages for highly-abstracted programs. For example, it includes a [partial-escape-analysis optimization](https://www.javadoc.io/static/org.graalvm.compiler/compiler/22.3.1/org/graalvm/compiler/core/phases/CEOptimization.html#PartialEscapeAnalysis) 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.internal.vm.compiler/src/jdk/compiler/graal/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/DebugInfo.md b/docs/reference-manual/native-image/DebugInfo.md
index abeb40212673..d170eb9aead5 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 _org.graalvm.compiler*_ package subspace.
+Note that the current implementation does not yet find some sources for the GraalVM JIT compiler in the _jdk.compiler.graal*_ 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/substratevm/docs/module-system/ModuleSystemSupportHosted.md b/substratevm/docs/module-system/ModuleSystemSupportHosted.md
index 4b2f94ce7cf9..503017e3d04b 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.internal.vm.compiler/org.graalvm.compiler.options=ALL-UNNAMED`
+that runs the image builder. E.g. often `--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.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 56351fa00ec7..57841eab3bcf 100644
--- a/substratevm/mx.substratevm/mx_substratevm.py
+++ b/substratevm/mx.substratevm/mx_substratevm.py
@@ -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(['org.graalvm.compiler.truffle.test.ContextLookupCompilationTest'] + truffle_args(extra_build_args + svm_experimental_options(['-H:-SupportCompileInIsolates'])))
+        native_unittest(['jdk.compiler.graal.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.internal.vm.compiler/org.graalvm.compiler.hotspot=ALL-UNNAMED',
-    '-J--add-exports=jdk.internal.vm.compiler/org.graalvm.compiler.options=ALL-UNNAMED',
-    '-J--add-exports=jdk.internal.vm.compiler/org.graalvm.compiler.truffle.compiler=ALL-UNNAMED',
-    '-J--add-exports=jdk.internal.vm.compiler/org.graalvm.compiler.truffle.compiler.hotspot=ALL-UNNAMED',
+    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.hotspot=ALL-UNNAMED',
+    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.options=ALL-UNNAMED',
+    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.truffle=ALL-UNNAMED',
+    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.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=org.graalvm.compiler,org.graalvm.libgraal,com.oracle.truffle',
+    '--initialize-at-build-time=jdk.compiler.graal,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.internal.vm.compiler/org.graalvm.compiler.phases.common', 'jdk.internal.vm.ci/jdk.vm.ci.meta', 'jdk.internal.vm.ci/jdk.vm.ci.services', 'jdk.internal.vm.compiler/org.graalvm.compiler.core.common.util']
+    packages = ['jdk.internal.vm.compiler/jdk.compiler.graal.phases.common', 'jdk.internal.vm.ci/jdk.vm.ci.meta', 'jdk.internal.vm.ci/jdk.vm.ci.services', 'jdk.internal.vm.compiler/jdk.compiler.graal.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 a9115b87ac79..a6d423e8c9ea 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1446,7 +1446,7 @@
                 ],
                 "uses" : [
                     "org.graalvm.nativeimage.Platform",
-                    "org.graalvm.compiler.options.OptionDescriptors",
+                    "jdk.compiler.graal.options.OptionDescriptors",
                     "com.oracle.svm.hosted.NativeImageClassLoaderPostProcessing",
                     "java.util.spi.ResourceBundleControlProvider",
                     "com.oracle.svm.core.feature.AutomaticallyRegisteredFeatureServiceRegistration",
@@ -1750,7 +1750,7 @@
                 "com.oracle.svm.driver.metainf",
               ],
               "uses" : [
-                "org.graalvm.compiler.options.OptionDescriptors",
+                "jdk.compiler.graal.options.OptionDescriptors",
               ],
               "requires" : [
                 "org.graalvm.nativeimage.builder",
@@ -1946,7 +1946,7 @@
                         "jdk.vm.ci.runtime",
                     ],
                     "jdk.internal.vm.compiler" : [
-                        "org.graalvm.compiler.options"
+                        "jdk.compiler.graal.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 60917058188c..58b42c2e9d94 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,11 +26,14 @@
 
 package com.oracle.graal.pointsto.standalone.test;
 
+import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
+import jdk.compiler.graal.nodes.spi.Replacements;
+
 import java.lang.reflect.Array;
 
 /**
  * This case is for
- * {@code org.graalvm.compiler.replacements.StandardGraphBuilderPlugins#registerArrayPlugins(InvocationPlugins, Replacements)}.
+ * {@link jdk.compiler.graal.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 6c843a37b0a2..b82034e4f226 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 0org.graalvm.compiler.debug.GraalError: org.graalvm.compiler.debug.GraalError: org.graalvm.compiler.debug.GraalError:
+ * cause 0jdk.compiler.graal.debug.GraalError: 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[]
  *         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: org.graalvm.compiler.debug.GraalError: org.graalvm.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[]
+ * 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[]
  *         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: org.graalvm.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.internal.vm.compiler/org.graalvm.compiler.debug.GraalError.shouldNotReachHere(GraalError.java:57)
+ * 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.internal.vm.compiler/jdk.compiler.graal.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 d57114633f33..e6421a3f9c5a 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 org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
+import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugin;
+import jdk.compiler.graal.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 c341e49ddf66..17551eec9f7e 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.debug.MethodFilter;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.debug.DebugOptions;
+import jdk.compiler.graal.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 66caa7e5b9b0..290adf4e35ac 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 org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.word.WordTypes;
+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 org.graalvm.nativeimage.hosted.Feature;
 
 import com.oracle.graal.pointsto.AnalysisObjectScanningObserver;
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 c4f8594cc920..085128972170 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 org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
+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 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 4ee5cd817ed4..a1ebfc1a2a06 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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 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 edcf58294efa..9819e622ddaf 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 1328741b1f6b..014d4a0f096d 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 03f70620df36..edf9fc2bc604 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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 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 098cee4f2cbe..c1b774074599 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 d8876aa28026..a811da8393c6 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 org.graalvm.compiler.core.common.spi.JavaConstantFieldProvider;
+import jdk.compiler.graal.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 34c8c76224ba..5e1b7777215b 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 org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
+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;
 
 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 d64797d45b66..47abe9377d77 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.DeoptBciSupplier;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.word.WordTypes;
+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 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 563bb3694dc2..cd89f7e39150 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 org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 d359fe58e1db..03759167e2c6 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.WordTypes;
+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 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 1773675ef470..e8c972d2d8ad 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,12 +44,14 @@
 import java.util.function.Consumer;
 import java.util.stream.StreamSupport;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.WordTypes;
+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 com.oracle.graal.pointsto.api.HostVM;
 import com.oracle.graal.pointsto.api.PointstoOptions;
@@ -256,11 +258,11 @@ public AnalysisType getObjectArrayType() {
     }
 
     public AnalysisType getGraalNodeType() {
-        return metaAccess.lookupJavaType(org.graalvm.compiler.graph.Node.class);
+        return metaAccess.lookupJavaType(Node.class);
     }
 
     public AnalysisType getGraalNodeListType() {
-        return metaAccess.lookupJavaType(org.graalvm.compiler.graph.NodeList.class);
+        return metaAccess.lookupJavaType(NodeList.class);
     }
 
     public TypeFlow getAllInstantiatedTypeFlow() {
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 2062d8de66ea..127d7412cee0 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.java.GraphBuilderPhase.Instance;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
+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 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 4f89f701d0bb..9a0104597fc3 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 org.graalvm.compiler.options.OptionType.Expert;
+import static jdk.compiler.graal.options.OptionType.Expert;
 
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 14ce838bd70e..f82448e16e5a 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 org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.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 a681bc3b9ebd..2ac6bedef0c4 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 org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugContext.Description;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.runtime.RuntimeProvider;
+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 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 b9d097c33c44..da3df0219722 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,13 +29,14 @@
 import com.oracle.graal.pointsto.typestate.TypeState;
 import com.oracle.graal.pointsto.util.AnalysisError;
 
+import jdk.compiler.graal.replacements.nodes.BasicArrayCopyNode;
 import jdk.vm.ci.code.BytecodePosition;
 
 /**
- * Models the flow transfer of an {@link org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode}
- * node which intrinsifies calls to System.arraycopy(). This flow registers itself as an observer
- * for both the source and the destination. When either the source or the destination elements
- * change the element flows from source are passed to destination.
+ * Models the flow transfer of an {@link BasicArrayCopyNode} node which intrinsifies calls to
+ * System.arraycopy(). This flow registers itself as an observer for both the source and the
+ * destination. When either the source or the destination elements change the element flows from
+ * source are passed to destination.
  */
 public class ArrayCopyTypeFlow extends TypeFlow {
 
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 d83c2a3b40f1..17403c5a5a14 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 org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.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 be528e9106a6..2d9945fa462b 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.EncodedGraph.EncodedNodeReference;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.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 1a02717b0459..1604daaf04bf 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 org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 ca3647ef3f24..9e1c718c4c4b 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
@@ -34,82 +34,82 @@
 import java.util.Map;
 import java.util.Optional;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopBeginNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.extended.GetClassNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.java.AtomicReadAndWriteNode;
-import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode;
-import org.graalvm.compiler.nodes.java.DynamicNewArrayNode;
-import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndExchangeNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
-import org.graalvm.compiler.nodes.spi.LimitedValueProxy;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.phases.common.BoxNodeIdentityPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
-import org.graalvm.compiler.phases.graph.MergeableState;
-import org.graalvm.compiler.phases.graph.PostOrderNodeIterator;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
-import org.graalvm.compiler.replacements.nodes.ObjectClone;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.core.common.spi.ForeignCallsProvider;
+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 org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.AbstractAnalysisEngine;
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 19b0adf634b4..11d0a64bedcc 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 org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
+import jdk.compiler.graal.nodes.extended.BytecodeExceptionNode;
+import jdk.compiler.graal.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 8c6048dfc7e4..ea501a1a59bb 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 org.graalvm.compiler.graph.Node;
+import jdk.compiler.graal.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 bfe213d0efff..388286f8aee8 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 org.graalvm.compiler.phases.common.LazyValue;
+import jdk.compiler.graal.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 d50660e12124..9be905256b6f 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 org.graalvm.compiler.nodes.ParameterNode;
+import jdk.compiler.graal.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 f9111518936d..8107e7ac116b 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 org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.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 eaba200100b4..a33c83138b39 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 f13b101d620e..46e4dd248ffe 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 org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.TypedConstant;
+import jdk.compiler.graal.core.common.type.CompressibleConstant;
+import jdk.compiler.graal.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 b139817ed10b..2702ca316e01 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.core.common.type.TypedConstant;
-import org.graalvm.compiler.debug.GraalError;
+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 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 36e7d85aea1d..62f9ff41fb8e 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 678f05ce573a..938bde7763e8 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 aafe9a94c9c2..da409bbc2ab0 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 org.graalvm.compiler.core.common.type.TypedConstant;
+import jdk.compiler.graal.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 adf1fc0f85ad..05d0c58856dc 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 org.graalvm.compiler.core.common.BootstrapMethodIntrospection;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+import jdk.compiler.graal.core.common.BootstrapMethodIntrospection;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.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 ea7859a0475d..da0a6247cc64 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 8d8b318331c3..92aee73695ca 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 7317e0ab168c..1b2c48b7bee2 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 org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.core.common.spi.MetaAccessExtensionProvider;
+import jdk.compiler.graal.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 4192d09828f9..84891e456e4d 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.BytecodeParser.BytecodeParserError;
-import org.graalvm.compiler.java.StableMethodNameFormatter;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.EncodedGraph.EncodedNodeReference;
-import org.graalvm.compiler.nodes.GraphDecoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
+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 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 6f7438c2f231..b399171702e7 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 aaada7077fc5..602ad7bb72d5 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 076c731d911f..bf59d5ec56d9 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.word.WordTypes;
+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.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 e247b9ee43c0..2c3bd22d0303 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 org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.replacements.nodes.BasicObjectCloneNode;
+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;
 
 @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 b3326f305fd3..8ddaafb810e5 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
+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 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 2f02b2e19015..564dddf40dd4 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 org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
+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 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 1f58caf8158c..ac16fbd9f104 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
@@ -24,12 +24,12 @@
  */
 package com.oracle.graal.pointsto.phases;
 
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.GraphDecoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+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 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/InlineBeforeAnalysisGraphDecoder.java b/substratevm/src/com.oracle.graal.pointsto/src/com/oracle/graal/pointsto/phases/InlineBeforeAnalysisGraphDecoder.java
index c461c62bfa1e..932d2e309755 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 org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
-import org.graalvm.compiler.replacements.nodes.MethodHandleWithExceptionNode;
-import org.graalvm.compiler.replacements.nodes.ResolvedMethodHandleCallTargetNode;
+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 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 434dec5865ae..b992ee0f1ab9 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 org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.compiler.graal.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 cf1d12204159..b845bc5b9d4d 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+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 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 d9f59eefc72c..88799f9b744c 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 org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.compiler.graal.nodes.FrameState;
+import jdk.compiler.graal.nodes.graphbuilderconf.ClassInitializationPlugin;
+import jdk.compiler.graal.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 9e0d51d0331d..e554f1290bc9 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 org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.replacements.IntrinsicGraphBuilder;
+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.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 1b9e42de5844..15701572b078 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 org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets;
-import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
+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 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 7584386d4144..1f835bac7a5d 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 org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.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 7572f8f06b61..d3748c5381be 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 org.graalvm.compiler.options.EnumOptionKey;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.options.EnumOptionKey;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 e60725d13323..42fc620d909c 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 cedf566e5bbf..8a53ab260c49 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 org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.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 643e667812d6..1584ed505e30 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.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 88ec6fdcd288..e349b118b622 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 org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LimitedValueProxy;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase.CustomSimplification;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+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 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 62c5420f27c5..8ecde6b94363 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 org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.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 dba71fb81bc6..b2fd5dac9f4f 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 org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.compiler.graal.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 9dd26e85233b..f968c845ab14 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 5a6a4b0e918c..bdd10af1d5f3 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Activation;
-import org.graalvm.compiler.debug.DebugContext.Description;
-import org.graalvm.compiler.debug.DebugContext.Scope;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.options.OptionValues;
+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 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 81ddc5be4fe3..3030509db556 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.api.runtime.GraalJVMCICompiler;
-import org.graalvm.compiler.api.runtime.GraalRuntime;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.runtime.RuntimeProvider;
+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 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 2edd8135ed5f..c49a74a899b4 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 org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+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 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 4fd283d31684..5cc175d1c195 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 5eda7ed9c49f..087c7ffabe1a 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+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 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 27b52dfd29f2..d28bf8753ead 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 org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.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 bc42854c2733..d7cc818d89c2 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 org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.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 9f631358a102..54feb7b1d6a3 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.TypedConstant;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.WordTypes;
+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 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 7612e0a00089..a9c7046ceaf2 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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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 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 58eee1f05ec8..253de7aca7ef 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 org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.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 5e05587ba146..18861e4c4606 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
+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 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 2095a0fa6ab8..ecfdf9582527 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 aed22568ee11..c9edba870e7f 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 f9027bc168d0..eae1bef3f827 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 cba47b1bcc8a..dea13a4886ed 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 a6cbaf1bb2ff..d81e586d7f7a 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 d2a9acf7bd65..530230aabaf4 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 71bd3e03dc71..e9dc44a89080 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 c197406eb984..7414af9929b6 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 0e8da8a50e08..f2c87812ecf1 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 edc4560b93d2..5f314e666a24 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 e0c7b9a56564..d6558926bb30 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 aa1a052fdd62..d5fd656e11d8 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 35fd9fd99ff9..760acd0afb70 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 9abf63c0f459..583d2034a1a2 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 d797c64d511f..af0cd7812ba8 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 0d70e7f8a758..7eac04feba36 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 9c8a02b48ccb..ea498543effd 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 2aad79b26251..79e729c73f42 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 f649d24fc474..84476b7e4fdc 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 7d0715f411c8..25e1861a5658 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 bec592b5a0e3..ddc648c1c9ef 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 e0af79415824..28bb5178138a 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 4dace4e14067..da1383afb0e5 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 cc7bd23d313d..455d3f393e32 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 945111fc4c33..b3f0e58af86b 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 456adceeb6c0..1ce72f4ec251 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 68c0212e0024..42caeea666a4 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 fc6901ada56e..45ed70d28ca4 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 696b9434c9aa..5305bb70939a 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 fe4c59bb8498..7075acf5d9a7 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 d01cfd143d9f..468170b5fec2 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 org.graalvm.compiler.options.EnumMultiOptionKey;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionsParser;
+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 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 6b2f9e88b5d6..118a6d0630e3 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 1ed2ed4d756b..823291674c50 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 e7ee09dd8ccb..e441acedd0d0 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 4d50b7a4eb3c..cc7bdb87110c 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 653279ea4ac4..201f9022961e 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 org.graalvm.compiler.java.LambdaUtils;
-import org.graalvm.compiler.phases.common.LazyValue;
+import jdk.compiler.graal.java.LambdaUtils;
+import jdk.compiler.graal.phases.common.LazyValue;
 
 import com.oracle.svm.configure.filters.ConfigurationFilter;
 import com.oracle.svm.configure.filters.HierarchyFilterNode;
@@ -127,6 +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("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 270a896f2f69..a3f361eab758 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 org.graalvm.compiler.phases.common.LazyValue;
+import jdk.compiler.graal.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 a3222e527014..effa8b74fffc 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 org.graalvm.compiler.phases.common.LazyValue;
+import jdk.compiler.graal.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 871b0ba95d98..6be609754882 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 org.graalvm.compiler.phases.common.LazyValue;
+import jdk.compiler.graal.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 f4de5f3b76a0..81af7be68c4e 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 a15651c19a73..49bdb18557f2 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 org.graalvm.util.json.JSONParser;
+import jdk.compiler.graal.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 5f7508fce6d5..2da740e172c1 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.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 566369edce45..00b4f37baab0 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 2860a6d5fe57..6f59aeb3e9d5 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.nodes.PauseNode;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 86dd5c3e0c48..71ed77ebd531 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 3ac40d5a385c..012899c1fc12 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 3f67c22930b6..48f4bb983730 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 791e0f5d0cd9..e319e5380708 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 a5caf759d016..93e086ec5d81 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 3281a53ac41c..63724fb0e038 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 f395ef97877d..d6defb9762e7 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.directives.GraalDirectives;
+import jdk.compiler.graal.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 6a6fabd0ad8a..64e0f9eb3749 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.word.Word;
+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 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 ae56b4410a93..25db5200a47f 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 40226d733f94..ff1377dafd41 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 3fca7eddd401..6e173aebe80f 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 d6819af09d97..009a8a03de36 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 9f781524dcd8..9744efe8a434 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 9bcd47d1cac3..6de7c9c9597f 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 7e4aed6af194..2f02e5c16562 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 be0def8590b7..dd4c071b59e3 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 a9b7ccaf9049..1b14e6b368a6 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
+import static jdk.compiler.graal.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 b8d496240607..61c0beb8f420 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 1aba4d423356..607194f96139 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 e2b2df83407e..51951d37bb49 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.compiler.graal.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 5f2384068b57..12b7dc5c1055 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 2ae2bbacc974..b3b298b4bc03 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 337b438b0388..3e740aca3739 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 cd2255a66f59..51f31a71a2ee 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 d04e6e6e876e..6af81127734e 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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 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 f870ac2dc944..da112a63257c 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.VERY_SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+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 org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.word.ObjectAccess;
+import jdk.compiler.graal.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 c2557e21d5bb..1c27f3931935 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.replacements.AllocationSnippets.FillContent;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.replacements.AllocationSnippets.FillContent;
+import jdk.compiler.graal.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 7a0a3ffca562..65daa566de53 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 dae405b49556..bb39a463f968 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
-import org.graalvm.compiler.nodes.gc.SerialArrayRangeWriteBarrier;
-import org.graalvm.compiler.nodes.gc.SerialWriteBarrier;
-import org.graalvm.compiler.nodes.gc.WriteBarrier;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 ebf216c6ceea..929209b092d0 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_4;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.gc.SerialWriteBarrier;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode.Address;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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;
 
 /**
  * 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 a20b00d3339e..247f6d6f6d3c 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.AllocationSnippets;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.word.Word;
+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 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 250fbb0ec588..5af97cbc22e5 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
@@ -27,8 +27,8 @@
 import com.oracle.svm.core.heap.Pod;
 import com.oracle.svm.core.snippets.SnippetRuntime.SubstrateForeignCallDescriptor;
 import com.oracle.svm.core.thread.Continuation;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.word.Word;
 import org.graalvm.word.UnsignedWord;
 
 import com.oracle.svm.core.genscavenge.HeapParameters;
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 b0db4bd1bef9..482ee322a296 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 ed669a55204c..09d07971d415 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.nodes.gc.CardTableBarrierSet;
+import jdk.compiler.graal.core.common.memory.BarrierType;
+import jdk.compiler.graal.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 71e8230ff64c..8c095ba7bae0 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
+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 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 850d77c52b08..f49abdbe91a4 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.replacements.AllocationSnippets;
+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 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 4af31b952e94..14addda85712 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.replacements.AllocationSnippets.FillContent;
+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 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 d4733dfd1326..104414331638 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_64;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_64;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_64;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_64;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.replacements.AllocationSnippets;
+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 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 f0aedf5a3630..6303e09998f6 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_16;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_16;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_16;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_16;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 8c678b33e9ad..16be4cf9014a 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.replacements.nodes.AssertionNode;
+import jdk.compiler.graal.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 d49928864d38..789525e7398a 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
+import jdk.compiler.graal.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 ca4bd4b7409b..e036e5524063 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 org.graalvm.compiler.nodes.gc.BarrierSet;
+import jdk.compiler.graal.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 8f7b870b487c..7717fd8606d1 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 org.graalvm.compiler.nodes.gc.BarrierSet;
+import jdk.compiler.graal.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 d641f6569a83..5a4b6de6894c 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 c59c995c714b..61971f14c253 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 e2d7f09c8b25..8c2e7608cc3f 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 68107cf8eff3..affdbaf375b0 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.core.common.NumUtil;
+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 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 3fcb93e0b5a1..c82b6be3129a 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.aarch64.AArch64BlockEndOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 95535f384ea4..5eff783dbc69 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 org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 1da67879ce63..87a8f96b6803 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 be90d999ac66..3b5f8723c7b7 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 org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler.SingleInstructionAnnotation;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.code.CompilationResult;
+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 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 ba0ae56c36dd..41719636b49b 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 org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 72b4e706e1c5..a126d94d48c5 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 org.graalvm.compiler.core.aarch64.AArch64SuitesCreator;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
+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;
 
 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 a0231502f65d..cf21dc832e2c 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 org.graalvm.compiler.core.common.GraalOptions.ZapStackOnMethodEntry;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue;
-import static org.graalvm.compiler.lir.LIRValueUtil.differentRegisters;
+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 java.util.function.BiConsumer;
 
-import org.graalvm.compiler.asm.BranchTargetOutOfBoundsException;
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.aarch64.AArch64Address;
-import org.graalvm.compiler.asm.aarch64.AArch64Address.AddressingMode;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler.PrefetchMode;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler.ShiftType;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.ScratchRegister;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.aarch64.AArch64AddressLoweringByUse;
-import org.graalvm.compiler.core.aarch64.AArch64ArithmeticLIRGenerator;
-import org.graalvm.compiler.core.aarch64.AArch64LIRGenerator;
-import org.graalvm.compiler.core.aarch64.AArch64LIRKindTool;
-import org.graalvm.compiler.core.aarch64.AArch64MoveFactory;
-import org.graalvm.compiler.core.aarch64.AArch64NodeLIRBuilder;
-import org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.gen.DebugInfoBuilder;
-import org.graalvm.compiler.core.gen.LIRGenerationProvider;
-import org.graalvm.compiler.core.gen.NodeLIRBuilder;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.aarch64.AArch64AddressValue;
-import org.graalvm.compiler.lir.aarch64.AArch64BreakpointOp;
-import org.graalvm.compiler.lir.aarch64.AArch64Call;
-import org.graalvm.compiler.lir.aarch64.AArch64ControlFlow;
-import org.graalvm.compiler.lir.aarch64.AArch64FrameMap;
-import org.graalvm.compiler.lir.aarch64.AArch64FrameMapBuilder;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.aarch64.AArch64Move;
-import org.graalvm.compiler.lir.aarch64.AArch64Move.PointerCompressionOp;
-import org.graalvm.compiler.lir.aarch64.AArch64PrefetchOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.asm.DataBuilder;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.lir.asm.FrameContext;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilderTool;
-import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.MoveFactory;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.DirectCallTargetNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoweredCallTargetNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.NodeValueMap;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.AddressLoweringByUsePhase;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 972424d36107..6e14db6dbe8f 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 org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.DefaultJavaLoweringProvider;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
-import org.graalvm.compiler.replacements.aarch64.AArch64GraphBuilderPlugins;
+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 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 448f14a93eed..be3a6204f701 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode;
+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 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 f6df582b9f14..218214b7a242 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 org.graalvm.compiler.core.aarch64.AArch64LoweringProviderMixin;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
+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 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 22291ee19295..e985b15b0bca 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 15bb068d421c..4ace5beff619 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 org.graalvm.compiler.core.phases.EconomyCompilerConfiguration;
+import jdk.compiler.graal.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 5c532cbddd20..091556076c6c 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 5cfe2a934244..f2a0ec0e6587 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 org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandSize.DWORD;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 1d899e471fe9..4dede4978d0d 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler.ConditionFlag;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64BlockEndOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 855bff4b10a2..7644436632de 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.HINT;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.HINT;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 e08b4ab19a2f..232f95408680 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 org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.AddressDisplacementAnnotation;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandDataAnnotation;
-import org.graalvm.compiler.code.CompilationResult;
+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 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 b322864c7b0c..0e83a3199525 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.ILLEGAL;
-import static org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.ILLEGAL;
+import static jdk.compiler.graal.lir.LIRInstruction.OperandFlag.REG;
 
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp;
-import org.graalvm.compiler.lir.amd64.AMD64BlockEndOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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.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 b71367f9604d..f69294a303e1 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 org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 7deb771b201e..e0b2e652cf67 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 org.graalvm.compiler.core.amd64.AMD64SuitesCreator;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
+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;
 
 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 19a2e6c0c7e9..218c15e7147a 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 org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.amd64.AMD64AddressNode;
-import org.graalvm.compiler.core.amd64.AMD64CompressAddressLowering;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.nodes.CompressionNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 d2f94b3b13cd..299c8e62ea0b 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.lir.LIRValueUtil.asConstantValue;
-import static org.graalvm.compiler.lir.LIRValueUtil.differentRegisters;
+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 java.util.Arrays;
 import java.util.Collection;
@@ -44,95 +44,95 @@
 import java.util.List;
 import java.util.function.BiConsumer;
 
-import org.graalvm.compiler.asm.Label;
-import org.graalvm.compiler.asm.amd64.AMD64Address;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.amd64.AMD64ArithmeticLIRGenerator;
-import org.graalvm.compiler.core.amd64.AMD64LIRGenerator;
-import org.graalvm.compiler.core.amd64.AMD64LIRKindTool;
-import org.graalvm.compiler.core.amd64.AMD64MoveFactory;
-import org.graalvm.compiler.core.amd64.AMD64MoveFactoryBase;
-import org.graalvm.compiler.core.amd64.AMD64NodeLIRBuilder;
-import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.Stride;
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.gen.DebugInfoBuilder;
-import org.graalvm.compiler.core.gen.LIRGenerationProvider;
-import org.graalvm.compiler.core.gen.NodeLIRBuilder;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.StandardOp.BlockEndOp;
-import org.graalvm.compiler.lir.StandardOp.LabelOp;
-import org.graalvm.compiler.lir.StandardOp.LoadConstantOp;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.amd64.AMD64AddressValue;
-import org.graalvm.compiler.lir.amd64.AMD64BreakpointOp;
-import org.graalvm.compiler.lir.amd64.AMD64Call;
-import org.graalvm.compiler.lir.amd64.AMD64ControlFlow.BranchOp;
-import org.graalvm.compiler.lir.amd64.AMD64FrameMap;
-import org.graalvm.compiler.lir.amd64.AMD64FrameMapBuilder;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.amd64.AMD64Move;
-import org.graalvm.compiler.lir.amd64.AMD64Move.MoveFromConstOp;
-import org.graalvm.compiler.lir.amd64.AMD64Move.PointerCompressionOp;
-import org.graalvm.compiler.lir.amd64.AMD64PrefetchOp;
-import org.graalvm.compiler.lir.amd64.AMD64ReadProcid;
-import org.graalvm.compiler.lir.amd64.AMD64ReadTimestampCounterWithProcid;
-import org.graalvm.compiler.lir.amd64.AMD64VZeroUpper;
-import org.graalvm.compiler.lir.amd64.EndbranchOp;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.asm.DataBuilder;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.lir.asm.FrameContext;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilder;
-import org.graalvm.compiler.lir.framemap.FrameMapBuilderTool;
-import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.MoveFactory;
-import org.graalvm.compiler.lir.gen.MoveFactory.BackupSlotProvider;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.DirectCallTargetNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoweredCallTargetNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.nodes.spi.NodeValueMap;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.AddressLoweringByNodePhase;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.amd64.AMD64IntrinsicStubs;
+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 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 59a2ad504e42..e7e1d1bc0e87 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 org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.DefaultJavaLoweringProvider;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
-import org.graalvm.compiler.replacements.amd64.AMD64GraphBuilderPlugins;
+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 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 2c07d78008cb..c843602665f1 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.ComputeObjectAddressNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode;
+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 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 ee58f9b3e3e9..584a8a6430d2 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 org.graalvm.compiler.core.amd64.AMD64LoweringProviderMixin;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.calc.RemNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
+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 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 164a46414637..32819ad4be4e 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 org.graalvm.compiler.core.common.LIRKind;
+import jdk.compiler.graal.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 de00ca69294c..d6eaa5846551 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 org.graalvm.compiler.core.phases.EconomyCompilerConfiguration;
+import jdk.compiler.graal.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 75c208017671..62be021f6731 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
+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 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 eb12bb86a91c..1dd70a38f9f0 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 org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
-import static org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
-import static org.graalvm.compiler.debug.GraalError.unimplemented;
+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 java.util.ArrayList;
 import java.util.Arrays;
@@ -45,43 +45,43 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.BiFunction;
 
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.DataSection;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.IllegalStamp;
-import org.graalvm.compiler.core.common.type.RawPointerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.BarrierSetLIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.lir.gen.MoveFactory;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 e4452407d64e..1976bdc18c14 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
+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 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 e72035828101..c5765b542d2f 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 50779f8117e4..c9dce83668c8 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 org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
-import static org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
-import static org.graalvm.compiler.debug.GraalError.unimplemented;
-import static org.graalvm.compiler.debug.GraalError.unimplementedOverride;
+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 java.util.ArrayList;
 import java.util.Arrays;
@@ -38,57 +38,57 @@
 import java.util.Set;
 
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.core.common.cfg.BlockMap;
-import org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.gen.DebugInfoBuilder;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.GraalGraphError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.DirectCallTargetNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoopEndNode;
-import org.graalvm.compiler.nodes.LoweredCallTargetNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.CompareNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerTestNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.nodes.java.TypeSwitchNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 63af6c04f021..3d9f73d013d1 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.CounterKey;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.TimerKey;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.asm.EntryPointDecorator;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.cfg.HIRBlock;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.AddressLoweringByNodePhase;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 f02fdc496e3f..8390b4097475 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.phases.common.AddressLoweringByNodePhase;
+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.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 091091ab13a4..05238d5a8ad7 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 fb4b1056353f..ac4421a6a3e8 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 org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.calc.RemNode;
-import org.graalvm.compiler.nodes.memory.ExtendableMemoryAccess;
-import org.graalvm.compiler.core.common.memory.MemoryExtendKind;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
+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 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 8ba0de4df718..613446646920 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 b232abc01442..d748885c0dac 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 org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
+import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.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 71f812e9107a..226f1f42fb6d 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 74498fb00373..1731286bcfc5 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 f591c70d1be9..b32cfa0aa75b 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 0846cf8267a4..c2d14fb43616 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 5c8c0b49387d..3e70ee8c6b5b 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 ba5d26c073ee..9bb9c58e5887 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 org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import org.graalvm.compiler.replacements.nodes.BitCountNode;
-import org.graalvm.compiler.replacements.nodes.FusedMultiplyAddNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+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 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 d777c4e52abf..6b5532d84892 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.ArithmeticLIRLowerable;
+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.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 c1a789213992..c863983009eb 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 20da7bc6fa7c..ddc2b87ed5d1 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 009fb5eb0140..1539ffa29a32 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 org.graalvm.compiler.debug.GraalError.shouldNotReachHereUnexpectedValue;
+import static jdk.compiler.graal.debug.GraalError.shouldNotReachHereUnexpectedValue;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.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 d7fb53b1461f..9fe98a7e8008 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 d6de8db8366c..57503a7341b6 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 org.graalvm.compiler.core.common.memory.MemoryOrderMode;
+import jdk.compiler.graal.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 75d056ac30c7..3087e159fc6f 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 org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
+import static jdk.compiler.graal.debug.GraalError.shouldNotReachHere;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
+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 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 187531d73671..6f2aabc9cb27 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.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 cb5ea3a479da..46e38050f255 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 14e05da466d6..cbb8e31c0672 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 da8db3089d01..d7f4e7265114 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 org.graalvm.compiler.debug.GraalError.shouldNotReachHere;
-import static org.graalvm.compiler.debug.GraalError.unimplementedOverride;
-
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.VirtualStackSlot;
+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 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 658c2270bb68..22e82fd5202c 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 org.graalvm.compiler.core.riscv64.ShadowedRISCV64;
+import jdk.compiler.graal.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 2bf0c18dcd35..e5538553738d 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 fbd838f468c8..ca0116c7dd0b 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 org.graalvm.compiler.core.riscv64.ShadowedRISCV64.allRegisters;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f10;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f11;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f12;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f13;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f14;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f15;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f16;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f17;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f18;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f19;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f20;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f21;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f22;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f23;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f24;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f25;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f26;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f27;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f8;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.f9;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x0;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x1;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x10;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x11;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x12;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x13;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x14;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x15;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x16;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x17;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x18;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x19;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x2;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x20;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x21;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x22;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x23;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x24;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x25;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x26;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x27;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x3;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x8;
-import static org.graalvm.compiler.core.riscv64.ShadowedRISCV64.x9;
+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 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 fdf21d9afaf1..f6e3d2338b56 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 911ae5fa3c5d..3659180dec83 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 a215d671f876..3edf125ad980 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 b1fb5a910774..85c0ef9a5915 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 bc216e4b52ca..dbf7e52d2dfc 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 d807fade3116..2d2990b88879 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 977b3307a1da..2b8bd1c83378 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 c66f1da01112..b89245281187 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 88e1a1e6c116..a06f2f38f7e3 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 6a69465819ee..0f332d2d9f19 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 org.graalvm.compiler.core.riscv64.ShadowedRISCV64;
+import jdk.compiler.graal.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 38319408e8a1..931ad7ec36f2 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 c14b463520f1..965e2f9abdf3 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 332bc4893c64..4b59ff966141 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 3ba98a900645..05292f3b8227 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 9061da03346c..8531df7dafe4 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 a0dc380af463..887a386652ba 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 6eed675e890a..3cc242eb4185 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 950535e188e5..e172be11fa70 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 748624e8ba07..b27a6fa18789 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 14f0ccf7d4a8..c6860de65177 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.core.common.type.Stamp;
+import jdk.compiler.graal.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 10a9e4bee165..f0df2c40153c 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 0f9a5e51be2f..7094fd543843 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 a3cb2d8ef380..7659e078330d 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 c685dfa5a41f..a30d83bffe84 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 a37b9ebf9de6..36830236f3dd 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 org.graalvm.compiler.word.BarrieredAccess;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.word.BarrieredAccess;
+import jdk.compiler.graal.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 30498134dc18..0f410bda4082 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 55d6257aafaa..e08c7905eff1 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 fc8993b0bffa..e034ad2f7129 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 dc2889d096b4..6700c25544a5 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 6a772278b7fc..70b96f5b8441 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 84d15285e169..53c2d37b6fcf 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 8d2dfd55bd9f..3143f94e5f48 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.Objects;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 0e97d6cb767f..a8a35006c199 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 64a59683f117..32fac8e9492c 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.nodes.PauseNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 552e2409a706..ee722e69d9a2 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 69a643e2520d..bec6202dd629 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 org.graalvm.compiler.core.common.SpectrePHTMitigations.None;
-import static org.graalvm.compiler.core.common.SpectrePHTMitigations.Options.SpectrePHTBarriers;
-import static org.graalvm.compiler.options.OptionType.Expert;
-import static org.graalvm.compiler.options.OptionType.User;
+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 java.nio.file.InvalidPathException;
 import java.nio.file.Path;
@@ -40,13 +40,13 @@
 
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.UnmodifiableEconomicMap;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.options.OptionValues;
+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 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/SubstrateSegfaultHandler.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/SubstrateSegfaultHandler.java
index a931b4b974dc..43560d5f96f0 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 b474d5af84d2..c847d9cd3938 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 org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.java.LambdaUtils;
-import org.graalvm.compiler.nodes.BreakpointNode;
+import jdk.compiler.graal.graph.Node.NodeIntrinsic;
+import jdk.compiler.graal.java.LambdaUtils;
+import jdk.compiler.graal.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 da181b982f05..b63724c0e21c 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 2b221484625d..64dc7fe5fba6 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+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 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 35d007a3f257..8ee2d5e511c5 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 ff601a6442f8..193f37412996 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 e1e40c62da75..0c885461e0ce 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 740a04cb056b..944488efb5e1 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 597650fd61f7..f97d0a3d69f8 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 a63a9c01afc3..2b06f8f55382 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 org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.nodes.java.ArrayLengthNode;
+import jdk.compiler.graal.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 42440177a83d..5a1855d08a3c 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 org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.nodes.java.ArrayLengthNode;
+import jdk.compiler.graal.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 91e3f73b0374..8a6cd3084533 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 org.graalvm.compiler.core.common.calc.UnsignedMath;
+import jdk.compiler.graal.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 3ea842ce43ea..302a0adcb3f2 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 3c5005a0e42c..e335538536ed 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 4ced13b537c7..b0809437d453 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 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 8b6770b77dd9..d62b3a790838 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 0c3261886c79..a624d9e5022f 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 b42145824be5..1dbf1e6f5da2 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.compiler.graal.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 ed20e3bc784a..6865acf7371e 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.util.FrequencyEncoder;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
-import org.graalvm.compiler.options.Option;
+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 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 7bc84912578f..3bd92622e2e0 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 76ef02526484..0d6a1ffc6b63 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 ba5c6b6332f4..e7d69de5694f 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.SourceMapping;
-import org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.code.SourceMapping;
+import jdk.compiler.graal.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 06e551148e8d..37a233320d8b 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 org.graalvm.compiler.graph.NodeSourcePosition;
+import jdk.compiler.graal.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 e48bb6a4f038..cc9c14119446 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 org.graalvm.compiler.core.common.util.FrequencyEncoder;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
-import org.graalvm.compiler.graph.NodeSourcePosition;
+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 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 02a55a997a59..4bd9a7cb552d 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 2c2ab95f8ab6..b619097861af 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 org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.nodes.FrameState;
+import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.compiler.graal.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 9c0ebb6fbcc5..a2d8d4a2102d 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.util.FrequencyEncoder;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+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 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 925031177255..62ae7e2c94d9 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 4b9942d69c6b..58027b764c09 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.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 8686e4f386ca..69cfdef741a3 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.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 33d8eddf7360..8806b93dd22e 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 d97a59c4c26f..22e8d26f6d31 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 org.graalvm.compiler.core.common.util.AbstractTypeReader;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.core.common.util.AbstractTypeReader;
+import jdk.compiler.graal.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 61df33e2481d..461a177a86b1 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 f2ee79291efb..538a7405b1f7 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 ddc55f1670c1..b2135c2c7f6e 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 f1a190f7fcc1..bce5e704c63b 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 1f126a2e68da..aa15f61214c3 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 aa3ecf1210c7..2a5bc974378a 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
+import jdk.compiler.graal.api.directives.GraalDirectives;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.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 c78a2ea1d5ee..0696a6a8c5b7 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.options.OptionStability;
+import jdk.compiler.graal.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 49b77297caf5..8959594964eb 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 org.graalvm.util.json.JSONParser;
-import org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.util.json.JSONParser;
+import jdk.compiler.graal.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 e333d8e10c35..5a276d44d828 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 d910374f1e0f..1e7012de3840 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 166a67838b48..6ddd232c7434 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 5ebcc0d4e463..9813989cae27 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 ff497052314b..d4b9b8550d18 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 7688673f8d94..74c75c916df5 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 org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
+import jdk.compiler.graal.graph.Node.ConstantNodeParameter;
+import jdk.compiler.graal.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 734c5ac273ac..b9ad5302f894 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil;
-import org.graalvm.compiler.core.riscv64.ShadowedRISCV64;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node.InjectedNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerTestNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
+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 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 bc8e174720fc..748b0ed00721 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.nodes.AESNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode;
-import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode;
-import org.graalvm.compiler.replacements.nodes.CounterModeAESNode;
-import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA3Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
+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 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 98d3a00f1761..6c57470e9f33 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 8a15041807d2..4b7c6b57a2ce 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 org.graalvm.compiler.graph.NodeSourcePosition;
+import jdk.compiler.graal.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 f5eac3de6d97..b3a044ade38a 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 36d2d10d2535..718368e4ffcd 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 org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.word.BarrieredAccess;
-import org.graalvm.compiler.word.Word;
+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 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 640b2448a4e4..e73be2a31dcf 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 org.graalvm.compiler.core.common.CompilationIdentifier;
+import jdk.compiler.graal.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 2a46acf13d06..65065d7419a4 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.
 ---------
-  org.graalvm.compiler.core.graph.PostOrderNodeIterator.*
+  jdk.compiler.graal.core.graph.PostOrderNodeIterator.*
 
-  Matches all methods in the class "org.graalvm.compiler.core.graph.PostOrderNodeIterator".
+  Matches all methods in the class "jdk.compiler.graal.core.graph.PostOrderNodeIterator".
 ---------
   *
 
   Matches all methods in all classes
 ---------
-  org.graalvm.compiler.core.graph.*.visit
+  jdk.compiler.graal.core.graph.*.visit
 
   Matches all methods named "visit" in classes in the package
-  "org.graalvm.compiler.core.graph".
+  "jdk.compiler.graal.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 3ed09261127d..1124c52c41c6 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 e8c3a42c9272..7eeeb898882f 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 org.graalvm.compiler.hotspot.EconomyCompilerConfigurationFactory;
+import jdk.compiler.graal.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 7e53a68ac84a..a101edea3723 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 org.graalvm.compiler.core.aarch64.AArch64NodeMatchRules;
-import org.graalvm.compiler.core.amd64.AMD64NodeMatchRules;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.gen.NodeMatchRules;
-import org.graalvm.compiler.core.match.MatchRuleRegistry;
-import org.graalvm.compiler.core.match.MatchStatement;
-import org.graalvm.compiler.core.riscv64.RISCV64NodeMatchRules;
-import org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.hotspot.CommunityCompilerConfigurationFactory;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 dddcf7ecf9d5..f6a6ef3343a7 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 9a210af3d8ea..4fe0392f105e 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 org.graalvm.compiler.asm.Assembler.CodeAnnotation;
-import org.graalvm.compiler.code.CompilationResult;
+import jdk.compiler.graal.asm.Assembler.CodeAnnotation;
+import jdk.compiler.graal.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 bfc825b26440..634aede0f966 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.alloc.RegisterAllocationConfig;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.LoweredCallTargetNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.SuitesProvider;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 1d14835576bc..15975feb3989 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 org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.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 12407f1396fd..ed542a6f71c2 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.compiler.graal.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 1aab009eaf00..b46b92369c09 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.graph.NodeSourcePosition;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.compiler.graal.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 8b21e12ea149..8e975520d114 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 org.graalvm.compiler.code.CompilationResult;
+import jdk.compiler.graal.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 abccd9e73d3d..5b27793664f0 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 org.graalvm.compiler.code.DataSection.Data;
-import org.graalvm.compiler.code.DataSection.Patches;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.TypedConstant;
-import org.graalvm.compiler.lir.asm.DataBuilder;
+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 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 4207f8050f34..cb2c48909059 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.gen.DebugInfoBuilder;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.NodeValueMap;
+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 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 e6af94a499bf..3561370d4b8a 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 org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.replacements.DefaultJavaLoweringProvider;
+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.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 6d35c08f41eb..fefb78561a21 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 org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
+import jdk.compiler.graal.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 53a96dc72fa1..0bd202e289fb 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 org.graalvm.compiler.lir.Variable;
+import jdk.compiler.graal.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 9b178ea0177d..ceaddd0e9988 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 org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
+import jdk.compiler.graal.nodes.gc.BarrierSet;
+import jdk.compiler.graal.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 c4550445747b..33f360592571 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 org.graalvm.compiler.java.DefaultSuitesCreator;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
+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;
 
 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 6cffb9ea0d6a..effb73d23d0c 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 org.graalvm.compiler.core.phases.CommunityCompilerConfiguration;
-import org.graalvm.compiler.core.phases.EconomyCompilerConfiguration;
-import org.graalvm.compiler.phases.tiers.CompilerConfiguration;
-import org.graalvm.compiler.phases.tiers.SuitesCreator;
+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 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 7658a481a86a..2831728c6ef8 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopySnippets;
+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 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 e8d684e7c2f3..66b836ebdd7f 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_UNKNOWN;
 
 import java.util.Map;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
-import org.graalvm.compiler.replacements.nodes.BasicArrayCopyNode;
+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 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 935cc27073b3..e22da9c1d76e 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 org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.replacements.nodes.BasicObjectCloneNode;
-import org.graalvm.compiler.replacements.nodes.MacroNode;
+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 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 8fcfca04efab..46767718c899 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 org.graalvm.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
+import static jdk.compiler.graal.nodes.PiNode.piCastToSnippetReplaceeStamp;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
 
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.replacements.nodes.ObjectClone;
-import org.graalvm.compiler.word.BarrieredAccess;
+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 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 117c122d0112..6a3ecf4f414f 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 org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.VirtualizerTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
-import org.graalvm.compiler.replacements.nodes.ObjectClone;
+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 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 4952d0df3b41..20e770c305b0 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 dad1d1a3f574..bdbb1908f5aa 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 org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 2ec382adb29c..a5cf11310e0b 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 org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+import jdk.compiler.graal.lir.LIRInstruction;
+import jdk.compiler.graal.lir.LIRInstructionClass;
+import jdk.compiler.graal.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 6d742f980254..ff5c4c8f4656 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 org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase;
+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 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 186c32ed42c7..bc843802a585 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 186273523b3b..e2f27791693c 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.word.WordTypes;
+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 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 7ab5ed7f986f..3bbc84523822 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CompressionNode.CompressionOp;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeadEndNode;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AndNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRightShiftNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.LoadMethodNode;
-import org.graalvm.compiler.nodes.memory.FloatingReadNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.DefaultJavaLoweringProvider;
-import org.graalvm.compiler.replacements.IsArraySnippets;
-import org.graalvm.compiler.replacements.SnippetCounter.Group;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
+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 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 921b80c4ddbc..d82cc85f1ca6 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 org.graalvm.compiler.core.common.spi.ForeignCallLinkage;
+import jdk.compiler.graal.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 ba47837024ea..91bf2064d734 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopyForeignCalls;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopyLookup;
+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 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 60108208532e..46a1d152f88a 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 org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 23ac9178fff6..b7e427da7a90 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 org.graalvm.compiler.core.common.CompressEncoding;
+import jdk.compiler.graal.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 08f07a709b7d..e9fa32b6b96b 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 org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
-import static org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext.CompilationContext.INLINE_AFTER_PARSING;
+import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createIntrinsicInlineInfo;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.StructuredGraph.AllowAssumptions;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.SnippetParameterInfo;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.replacements.ConstantBindingParameterPlugin;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
-import org.graalvm.compiler.replacements.ReplacementsImpl;
-import org.graalvm.compiler.word.WordTypes;
+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 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 280c2a6a69a0..c7d5fd81741e 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 1d6a0161627a..8029f9b182de 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 org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.nodes.spi.StampProvider;
+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;
 
 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 e021e1d2ddb3..3d59e6023ffa 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 a29dfe103175..b0befffae6e6 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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 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 cb68d5f0f469..88e07f95b283 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizingFixedWithNextNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 3bcb53c35fa3..4d88d1aa6bf2 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 f96fca1a8c2e..e7ac8378e1aa 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 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 a85d647b4ab0..113ec353bffc 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
+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 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 8b77ae0d3967..e658c2f18d6c 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 org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.LoweredCallTargetNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 3c898d3a1f8b..7176073d8205 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.LoopExitNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
+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;
 
 /**
  * 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 0b348eea8d18..26b84e3a8c0b 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.gen.NodeLIRBuilder;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.LabelRef;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 c8e55daa4a2d..5b931ba8741c 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 org.graalvm.compiler.nodes.FixedNodeInterface;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
+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;
 
 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 57ade97e07fd..8a5cfbfeba16 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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;
 
 /**
  * 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 ae83e36d2494..a9a76e51768a 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
 
 import java.util.List;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 5d68d4a98951..8674e484a255 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.DeoptimizingNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 d3211d7b89a5..94d055857ace 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 bf0bbfce4065..a97995f3cc96 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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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.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 51af51913e1f..f4f1db4063c6 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 org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node.NodeIntrinsicFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.extended.ForeignCall;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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 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 a4e290cb9ae6..2133fd9d62b6 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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.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 28e3eca0aa11..919ee4a88a1d 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_0;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
 import java.util.function.Function;
 
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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.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 599457c96cba..f235953fc06d 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,20 +24,21 @@
  */
 package com.oracle.svm.core.graal.nodes;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 com.oracle.svm.core.graal.code.SubstrateLIRGenerator;
 
 /**
- * Lowered version of {@link org.graalvm.compiler.nodes.DeadEndNode}.
+ * Lowered version of {@link DeadEndNode}.
  */
 @NodeInfo(cycles = NodeCycles.CYCLES_0, size = NodeSize.SIZE_0)
 public final class LoweredDeadEndNode extends ControlSinkNode implements LIRLowerable, IterableNodeType {
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 8821efd37480..064d10deb1db 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_2;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
+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;
 
 @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 f7c5f0fb2a65..7d859fd0c9b8 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
+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.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 d0480f3fea0d..ee6da787a217 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.AbstractNewArrayNode;
+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.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 9f7df2016063..5f9cb190756a 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 90679e953e45..6a41923e6dc0 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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 5d551605c18f..5461a72a99d2 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 org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 739b984e75a6..af798c90ebe9 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 929f6864b581..06bb95a2e0ee 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 fecedaa2d760..4f284ce162e9 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 fc5dc72e5586..eb4a7b5da107 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
-
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.CompressionNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 de5899f4e79e..afa3be6812f8 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 org.graalvm.compiler.nodes.FieldLocationIdentity;
+import jdk.compiler.graal.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 ab0231f40272..3735f944456f 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 org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.CompressionNode.CompressionOp;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
+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 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 22de0cd6e4b3..840b1e250364 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.AbstractNewArrayNode;
+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 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 b0cfdde5aa93..790d5da9725f 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.replacements.nodes.ReflectionGetCallerClassNode;
+import jdk.compiler.graal.graph.NodeClass;
+import jdk.compiler.graal.nodeinfo.NodeInfo;
+import jdk.compiler.graal.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 149d16d11b9e..162ef3765ffb 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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 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 72d8079f806f..c3aacccedbb9 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 org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_2;
+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 java.util.List;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.NodeWithState;
+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;
 
 /**
  * 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 a16810a2fc35..00356c82bfa3 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_4;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
-
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 5aeca975236d..24076ec1c951 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 org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 df94f7ed0ab8..7e53f3916a26 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 01270d8ce18e..e3767420a099 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 f90080160768..7e6bdd38944c 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 097c854e6287..51584adbabb4 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 e687cba35b26..8c191e0b3116 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 ffdf7d92f101..112885911e88 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 30bda4032d9d..6f3f3bfa2581 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 org.graalvm.compiler.lir.LIRInstruction.OperandFlag.REG;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+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 org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.Opcode;
-import org.graalvm.compiler.lir.Variable;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.gen.LIRGeneratorTool;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 06330e77f3eb..91657d5dc030 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 org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.DynamicDeoptimizeNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase;
+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 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 908210895588..3f4f888bc8ab 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.phases.Phase;
+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 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 d74180b8dd1b..3373c9b4dfba 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeBitMap;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.ControlSinkNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.DeadEndNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.ProfileData;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.SwitchNode;
-import org.graalvm.compiler.phases.Phase;
+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 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 6de87b0b9875..8d1eb1a7cd9c 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.Phase;
+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 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 9f57a6ff8eaa..76e987deffe7 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 org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
+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 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 c4d91c2b2d1f..7b3d7859fcff 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.graphbuilderconf.TypePlugin;
+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 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 1345aab3d7d8..4d957fc6cefe 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.StateSplitProxyNode;
-import org.graalvm.compiler.nodes.extended.UnboxNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.GraphKit;
-import org.graalvm.compiler.word.WordTypes;
+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 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 a2215539a1c0..1807976afcba 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.UnreachableNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IntegerDivRemNode;
-import org.graalvm.compiler.nodes.calc.SignedDivNode;
-import org.graalvm.compiler.nodes.calc.SignedRemNode;
-import org.graalvm.compiler.nodes.calc.UnsignedDivNode;
-import org.graalvm.compiler.nodes.calc.UnsignedRemNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 5c91765ef1e8..e1f446d1c4ae 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 5bf1a8228eb7..853e7e82929b 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 76c895499762..e765769bdb47 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.PauseNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.word.Word;
+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 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 0b8463b956ab..399a3c9558d8 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 51f5c6e1c365..4fc8d2172c44 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.LoweringTool.LoweringStage;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 8bcae9c89a63..d995e908e2c1 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractDeoptimizeNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.DynamicDeoptimizeNode;
-import org.graalvm.compiler.nodes.UnreachableNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 9e4384fbd654..84e8cece1d5f 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 1c6a3db48e10..739783bb411a 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 42cf982444ce..93fefb4da263 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 bd573f99b948..3f5043f421a3 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 org.graalvm.compiler.nodes.UnreachableNode.unreachable;
+import static jdk.compiler.graal.nodes.UnreachableNode.unreachable;
 
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 8ee4bbf14d83..a9b937bc22a2 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.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 6de95a08b67f..b64de14ddf90 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.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 35d3b2984fc8..92f9ecb66bb6 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DirectCallTargetNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.LoweredCallTargetNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.extended.FixedValueAnchorNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.GetClassNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.OpaqueValueNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.spi.LoweringTool.StandardLoweringStage;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 320dc4ff15a8..c68991847a4a 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodeinfo.Verbosity;
-import org.graalvm.compiler.nodes.SafepointNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 635859b11702..82600e0400e5 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 c6c704b08a46..656e9b6d0afb 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 import java.util.function.Predicate;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 ec21b52bb9ab..f3fa72e27dc1 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 org.graalvm.compiler.nodes.PiArrayNode.piArrayCastToSnippetReplaceeStamp;
-import static org.graalvm.compiler.nodes.PiNode.piCastToSnippetReplaceeStamp;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FAST_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
-import static org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+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 java.util.Arrays;
 import java.util.Map;
 
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.api.replacements.Snippet.NonNullParameter;
-import org.graalvm.compiler.api.replacements.Snippet.VarargsParameter;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.GraphState;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.java.DynamicNewArrayNode;
-import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.java.ValidateNewInstanceClassNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.AllocationSnippets;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.replacements.SnippetCounter;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.word.BarrieredAccess;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 fb5aad712efb..506e802e64ce 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.BreakpointNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.LoadHubOrNullNode;
+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 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 1858720bbfca..09723f642514 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 org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate.AbstractTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 4a38373a21ac..450778ac5f01 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.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.probability;
 
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.calc.UnsignedMath;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.SnippetAnchorNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.java.ClassIsAssignableFromNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.InstanceOfSnippetsTemplates;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 d0756528ae77..6cad2d175ee4 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.calc.RemNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
+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 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 94d463a94d69..628a95b97c74 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 66cb22667148..d35ed888356e 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 a4dab737b8a1..ac4996c208db 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 bb7928eca74e..6ee91e841dd4 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 675356f909c4..f0386326f948 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.amd64.AMD64ConvertSnippets;
+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 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 5ff6066ba92d..abe6f90e71e2 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 4b620dd0b494..f4156c1dcc73 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 e0a309b8408c..fa2c067a919d 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.memory.WriteNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 801b7452748a..6452d7d25e2a 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 d5312d13acff..bafbf043374c 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 05b5dbab4bf6..1aea2dd301c4 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 587e3b83aa77..11110caecfde 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.ConstantValue;
-import org.graalvm.compiler.lir.VirtualStackSlot;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 1eef273f369b..f823dad959fc 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
-import org.graalvm.compiler.phases.common.LoweringPhase;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 482c2aea9401..f7d9c8454a4c 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 org.graalvm.compiler.nodeinfo.InputType.Memory;
-
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.calc.UnsignedMath;
-import org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 7d4d6dd345ec..f114f15a5463 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 org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.Phase;
+import jdk.compiler.graal.nodes.FrameState;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 8bf0cb21b49c..85fc2157a0b1 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 org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.Phase;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 b97c2ffee68b..dddc2c9ea713 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_SLOW_PATH_PROBABILITY;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.api.replacements.Snippet.ConstantParameter;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 e2db2ee98df5..7b54f0182c92 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 0713530ac8c5..09d62a408cfe 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_8;
 
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.UnsafeCompareAndSwapNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 bc5e39c28f29..208382df2dcb 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 org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.memory.FloatableThreadLocalAccess;
-import org.graalvm.compiler.nodes.memory.MemoryAccess;
-import org.graalvm.compiler.nodes.memory.MemoryKill;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 9de55e00270a..09cf02cb0ed5 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_2;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_2;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.JavaWriteNode;
-import org.graalvm.compiler.nodes.memory.OrderedMemoryAccess;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 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 cbe68f80a21f..86bfe45f11d7 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 e926f9110bb1..4509e1af6778 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 org.graalvm.compiler.nodes.extended.GuardingNode;
+import jdk.compiler.graal.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 3c6a9f21252c..5a22c726104d 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.memory.FixedAccessNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.word.WordOperationPlugin;
-import org.graalvm.compiler.word.WordTypes;
+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 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 d0e81f45d679..47c8e7fbc6ed 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 org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.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 8be6fd22a24b..9e0db1a9970e 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 cdf33af96f46..e5262707fb88 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 ebdf35f3cc0c..ea4eda1a1555 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,14 +24,13 @@
  */
 package com.oracle.svm.core.heap;
 
-import org.graalvm.compiler.nodes.gc.BarrierSet;
+import jdk.compiler.graal.nodes.gc.BarrierSet;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
 public interface BarrierSetProvider {
     /**
-     * Returns a suitable {@link org.graalvm.compiler.nodes.gc.BarrierSet} for the used garbage
-     * collector.
+     * Returns a suitable {@link BarrierSet} for the used garbage collector.
      */
     BarrierSet createBarrierSet(MetaAccessProvider metaAccess);
 }
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 6eba6c4dfc5f..f82188bddbc2 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 org.graalvm.compiler.core.common.util.AbstractTypeReader;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.core.common.util.AbstractTypeReader;
+import jdk.compiler.graal.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 60c8d6917f82..f8980dcba418 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 org.graalvm.compiler.core.common.util.TypeWriter;
+import jdk.compiler.graal.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 396347e5132f..cd2228811cb2 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 d74bd5435bf0..21d09aa7bacb 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.word.ObjectAccess;
+import jdk.compiler.graal.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 eaa08966bd19..0078023ea7c2 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 913455f96153..ec467efc3eaa 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.BarrieredAccess;
+import jdk.compiler.graal.api.directives.GraalDirectives;
+import jdk.compiler.graal.nodes.java.ArrayLengthNode;
+import jdk.compiler.graal.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 b2a174de1492..7c98f691f25b 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.core.common.CompressEncoding;
+import jdk.compiler.graal.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 c3f22e0e6bf2..7659e647f08a 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.word.BarrieredAccess;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 827a1ac88492..3b1b6b0226b6 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 fc464ee74052..33de7550e12f 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.probability;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.EXTREMELY_FAST_PATH_PROBABILITY;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
 import java.lang.ref.Reference;
 import java.lang.ref.SoftReference;
 
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.word.BarrieredAccess;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 cc534a8c8607..cab03286ce60 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 org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.compiler.graal.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 c804805e5d86..b569d76f2e76 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 fa9b6ef89bb9..e8da66702ef1 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.Word;
+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 org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.StackValue;
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 f70f05a7974f..be962ca2528d 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 65ce796a0e4d..909eb191c762 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.framemap.ReferenceMapBuilder;
+import jdk.compiler.graal.core.common.LIRKind;
+import jdk.compiler.graal.lir.LIRFrameState;
+import jdk.compiler.graal.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 c3d61c9ab4e5..e7efb051d921 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 org.graalvm.compiler.nodes.java.ReachabilityFenceNode;
+import jdk.compiler.graal.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 6299b046f5a4..b1b4bb15427c 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 ae9714454e3f..6008d73102ee 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 09a737071269..7f025e5314a0 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 3f0e870d94cc..40c387bbb62e 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 a1edef671646..95c20c0f5a8c 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 20dacf2adaf2..9a7b51dcf640 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 903d9ec9623e..44266f9b4231 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 a900648dba31..39b0eb3616e6 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 385c917fc1ae..e7265520fc6e 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 3e4ff5d23a57..e0e2ab9aad11 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.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 989fad267fa8..cc7a03916128 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 org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.nodes.java.ArrayLengthNode;
+import jdk.compiler.graal.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 b1f30bc5a7d8..37740de90462 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 org.graalvm.compiler.core.common.calc.UnsignedMath;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.calc.UnsignedMath;
+import jdk.compiler.graal.nodes.java.ArrayLengthNode;
+import jdk.compiler.graal.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 ad89960967aa..802cf78b0a34 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 3d7aa403a0f2..0b2443a8918c 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 32ffd9585564..47d535cc5dc1 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 org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.IdentityHashCodeSnippets;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 1c598f60d9e7..16c6315787ae 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.type.TypedConstant;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.replacements.nodes.IdentityHashCodeNode;
+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 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 a990d5539289..f7eb407f8abd 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.LIKELY_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.SLOW_PATH_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.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.SLOW_PATH_PROBABILITY;
+import static jdk.compiler.graal.nodes.extended.BranchProbabilityNode.probability;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.IdentityHashCodeSnippets;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 8b5844b9df97..1a9b106a6816 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 da995bd849d6..9a55dbf81f00 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 b9911b32de4c..c2a1a04addb3 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 3cfec6ed9238..d5e319a626e2 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 92f1196592bb..564ca2aef8ad 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 92a235285958..03bdf9f72cf2 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 d3f7ef2311af..9425414370a6 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 a17bbd2e0abd..068ea6394123 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 85d73f59deaa..f559f90d1743 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 5e19e7371d5e..7b65a41d29b8 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 org.graalvm.compiler.word.BarrieredAccess;
+import jdk.compiler.graal.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 9ff2c31c601c..f988b36b97e8 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 org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+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 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 f6e80184507e..2f5c5f613791 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 105c9a9f23ac..d6caa6971fe3 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 71f0ed6fe95c..308f01da0ec7 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 def3967df592..f27f141b3491 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 org.graalvm.compiler.nodes.extended.MembarNode;
+import jdk.compiler.graal.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 7e14f5cc7fb3..47ea05da1a46 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 20189be8cd76..71f527120a8f 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 1350e99f0423..1b3973869e7e 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 org.graalvm.compiler.nodes.UnreachableNode;
+import jdk.compiler.graal.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 42c936d66dbf..feeaf5a0c5ea 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 6fdc8e5621e7..01711633ab18 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 95d7b9bdb110..b3f2f80556cb 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 eb647ed50233..2077e46f69f4 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 0369dcfad367..c30f350b7d23 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 d401f3f51e22..eb1ea6497e3f 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 a99b93bfe09a..27cb7c41b570 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 4d1f50e2cf45..6ea5c43dd374 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 a36163d2a737..b834da6834ed 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 3358e08862d0..1863f583ab64 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 674aea0415b4..da09146abb2b 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 7d8e4bf1e556..249aa69bc73a 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 0beb0e1c6b80..223f99f07046 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 org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.options.OptionsParser;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.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 2b4cdd7c53d8..b50a0d494aac 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 07d969e2f1e7..570fe75eb3e7 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 2dd8471fc34b..40b412911de1 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 0d17658f8ad6..c483a4f0cad7 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 dcf127622f6f..faae9c40a193 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 9f237577fb31..512249a6d1b5 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 f278540cbb50..486b41ae616d 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 ab4dbc5ea6fb..8beb3b8e5442 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 abb7bdf784ae..7b02a000e91b 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 64e126497f16..16be69444bd9 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 b027ce6ac4a3..f8cafc2b4b2a 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 d23361760251..c33f9e3a55bb 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 a96e1c5abf50..5dcc6b702fde 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 c819cf5f6568..0bd36f9afc77 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 9f024d5ee3a1..251fb08bb594 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 f811a8dc35a6..b098e608c228 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 8015631c2159..68a2a82363c5 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.nodes.extended.BranchProbabilityNode;
+import jdk.compiler.graal.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 ea9ec7629e44..3d9d1147d9f0 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 org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.word.BarrieredAccess;
+import jdk.compiler.graal.nodes.NamedLocationIdentity;
+import jdk.compiler.graal.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 f0c4b7eb54b1..b469b9e915d4 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 33bb0c7201fb..a55f683da821 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 a8a2f40b8dc8..1b50dd939285 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.nodes.java.ArrayLengthNode;
+import jdk.compiler.graal.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 4fd47af1e1f1..6396357d95d3 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 org.graalvm.compiler.serviceprovider.IsolateUtil;
+import jdk.compiler.graal.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 163d3de47765..72eb2fd5a963 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 29f1aed99692..2bddc883bc39 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 fdf1a2a2aaa6..dfd3df85f88e 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 org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.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 a18066927ccb..fd317fd1afa8 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 787705f9880c..950216add4f7 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 ee1228ebefcd..8a743915bb5b 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 3472cb92a64a..5a97981773a3 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 81e14036079a..8976c9ba1cee 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 org.graalvm.compiler.core.common.calc.UnsignedMath;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.calc.UnsignedMath;
+import jdk.compiler.graal.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 b9420063003e..a91281d2bf0a 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 org.graalvm.compiler.core.common.type.CompressibleConstant;
+import jdk.compiler.graal.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 5749f438367e..3c90b07a86e2 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,7 +24,8 @@
  */
 package com.oracle.svm.core.meta;
 
-import org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
@@ -36,9 +37,8 @@
  * comparable, but their {@link Object#equals} methods should not and cannot (due to dependencies)
  * have direct knowledge of other classes, so their methods delegate to this class. This code
  * overlaps with {@link ConstantReflectionProvider#constantEquals}, but existing code relies on
- * directly testing object equality on constants, such as the
- * {@link org.graalvm.compiler.truffle.compiler.nodes.ObjectLocationIdentity} class, which is
- * crucial for the alias analysis of memory accesses during compilation.
+ * directly testing object equality on constants, such as the {@link ObjectLocationIdentity} class,
+ * which is crucial for the alias analysis of memory accesses during compilation.
  */
 public interface ObjectConstantEquality {
     @Fold
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 e30a8f964b5e..3d933feebab1 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 org.graalvm.compiler.core.common.LIRKind;
-import org.graalvm.compiler.core.common.spi.LIRKindTool;
-import org.graalvm.compiler.core.common.type.AbstractPointerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
+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.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 8592a8fcd5de..56a97c2a7cdc 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 org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.TypedConstant;
+import jdk.compiler.graal.core.common.type.CompressibleConstant;
+import jdk.compiler.graal.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 8d890f754b25..000adb48d0ac 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 482a211194ef..3a366678e8d3 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 org.graalvm.compiler.nodes.extended.BranchProbabilityNode.FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.NOT_FREQUENT_PROBABILITY;
-import static org.graalvm.compiler.nodes.extended.BranchProbabilityNode.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 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 2abafc59190c..6471fa27f6c4 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 387f29872f1c..f1f600c16edc 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.nodes.java.AccessMonitorNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.MonitorExitNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
+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 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 abbc7f94bc00..4ded426160b4 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 8203007de1d7..39ce7a19aa02 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.word.BarrieredAccess;
+import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 fc7b0b255cf3..24091e3009c7 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,23 +24,24 @@
  */
 package com.oracle.svm.core.nodes;
 
-import static org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_UNKNOWN;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_UNKNOWN;
+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 java.util.Objects;
 
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
+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 org.graalvm.word.LocationIdentity;
 
 /**
@@ -52,8 +53,8 @@
  * {@link CFunctionEpilogueNode}. This means that this node is executed while in native state. As
  * such, the capture function should be uninterruptible, and never transition to/from Java. Any
  * preprocessing on the arguments (e.g. unboxing a long, or retrieving them from a field) should be
- * done before the prologue; {@link org.graalvm.compiler.nodes.extended.FixedValueAnchorNode} can be
- * used to prevent the computations from floating in between the prologue/epilogue.
+ * done before the prologue; {@link FixedValueAnchorNode} can be used to prevent the computations
+ * from floating in between the prologue/epilogue.
  * 

  * You need to register the capture method for foreign call and may need to declare it as an
  * analysis root.
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 c67d4a793fba..5fd2816a98f8 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 org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.InputType.State;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.DeoptimizingNode.DeoptBefore;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 44482a8973a3..0b5bc75d6c7b 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 org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 4038c759729d..a6de4a0bedce 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 org.graalvm.compiler.nodeinfo.InputType.Memory;
-import static org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_8;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_8;
+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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.debug.ControlFlowAnchored;
-import org.graalvm.compiler.nodes.memory.SingleMemoryKill;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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 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 f962c29aac32..d540197ca481 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 org.graalvm.compiler.nodeinfo.NodeCycles.CYCLES_1;
-import static org.graalvm.compiler.nodeinfo.NodeSize.SIZE_1;
+import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
+import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.Lowerable;
+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;
 
 @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 4e48ad0c8cca..d8f83a8805b0 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 efd1abdc4827..37a5b6f0915a 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 org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+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.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 625540681a77..24d1ef0ebb34 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 2fbf91cae97f..3502d9dbf8b7 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 e203b25c7f70..9daac8b4c6de 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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 76fca8ccfbb2..68eed0474e8d 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 22cdaddddacd..620604709b66 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 org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.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 e92e493ef6cc..931ab4dc9de6 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 8cb1535a3345..40633fdb9f3d 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.options.OptionsParser;
+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 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 818f0323e03b..78f8c8f3a945 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.ModifiableOptionValues;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.options.OptionsParser;
+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 org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.RuntimeOptions.Descriptor;
 import org.graalvm.nativeimage.impl.RuntimeOptionsSupport;
@@ -148,8 +148,8 @@ public Descriptor getDescriptor(String optionName) {
     }
 }
 
-@TargetClass(org.graalvm.compiler.options.OptionKey.class)
-final class Target_org_graalvm_compiler_options_OptionKey {
+@TargetClass(OptionKey.class)
+final class Target_jdk_compiler_graal_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 6247d2331dce..3a77e67ca972 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 org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.options.OptionDescriptor;
+import jdk.compiler.graal.options.OptionDescriptors;
+import jdk.compiler.graal.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 8f919e8d8d57..d709fd70da5f 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 org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.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 cd9f8374d4d3..4865a70e553d 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 org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.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 813e27d82f36..599edf1e4907 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 org.graalvm.compiler.options.Option}. Values are stored in
- * {@link org.graalvm.compiler.options.OptionValues}.
+ * annotation {@link jdk.compiler.graal.options.Option}. Values are stored in
+ * {@link jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Fold}
+ * in the image. This is implemented using the {@link jdk.compiler.graal.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,10 +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 org.graalvm.compiler.options.OptionValues}. Therefore, access of a Graal option using
- * {@link org.graalvm.compiler.options.OptionKey#getValue(org.graalvm.compiler.options.OptionValues)}
- * requires to explicitly specify one of the two option values of Substrate VM:
+ * {@link jdk.compiler.graal.options.OptionValues}. Therefore, access of a Graal option using
+ * {@link jdk.compiler.graal.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
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 c30bdd8ec2fa..80afbfd0f7bb 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 d23a60627171..9b893ade1add 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 27f18ac53589..a3863b19e75f 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 215f4add6a52..9495ce2b55e3 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 0e99a69c14b1..1711df10c39a 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 91cdac7b785d..f5bb21a4e553 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 767f5a58a70e..5bbdd62f89b0 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 cbea7ae72b47..6a719e63de7f 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 25c713fcaa4d..7d802f8e4965 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 6a90a896049a..51c443b22812 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 e0460330c7ff..1b02be0441a2 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 org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.word.BarrieredAccess;
+import jdk.compiler.graal.nodes.NamedLocationIdentity;
+import jdk.compiler.graal.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 b1a3d5f075af..6fe983bed303 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 73397a809523..9f3aa8bcc8c5 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 982ec6217acd..2331edcad68c 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 org.graalvm.compiler.core.common.util.UnsafeArrayTypeReader;
+import jdk.compiler.graal.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 9ab61ef033de..e9e5fd9e1890 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 3cb7b3b265b7..3186f04c8537 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 org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil;
+import jdk.compiler.graal.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 6fc8f6c9e83d..173b2509c8e9 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 2543feceb751..8442d7cd30f4 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 2eb2fae90407..5d2cdac0a682 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 b6d839205c8f..be19927c57d1 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 bcde98e44d7f..220dd164ac12 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 org.graalvm.compiler.nodes.PauseNode;
+import jdk.compiler.graal.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 31f8345be826..117916a18e31 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 cfdf31450b7d..ebd892456754 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.BinaryOperation;
-import org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.UnaryOperation;
+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 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 dfad2f6cf095..afad65c7fbfa 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 org.graalvm.compiler.replacements.IsArraySnippets;
+import jdk.compiler.graal.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 61a6bd4fd1ad..0d7cd68f3a61 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 b5dabf6073a8..ba9f94872d89 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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/Continuation.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java
index 1d30942ee6dc..e1abbde3e83e 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Continuation.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.thread;
 
-import org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 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/thread/ContinuationSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationSupport.java
index 268b69be5877..6eee1454bc19 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
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.thread;
 
-import org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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/ContinuationsFeature.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationsFeature.java
index 667712446f67..f40e11e5d72a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationsFeature.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/ContinuationsFeature.java
@@ -26,7 +26,7 @@
 
 import java.lang.reflect.Field;
 
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.RuntimeClassInitialization;
 
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 1af34b3d7767..d24b51c5fbac 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 org.graalvm.compiler.nodes.PauseNode;
+import jdk.compiler.graal.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 b9f86b1d4ac4..bcb07cb67735 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
@@ -30,10 +30,10 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicLong;
 
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
+import jdk.compiler.graal.api.directives.GraalDirectives;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.replacements.ReplacementsUtil;
 import org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.IsolateThread;
 import org.graalvm.nativeimage.Platforms;
diff --git a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomSupport.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomSupport.java
index 85bbe02e7e70..3de9625cec5a 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomSupport.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomSupport.java
@@ -24,7 +24,7 @@
  */
 package com.oracle.svm.core.thread;
 
-import org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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/LoomVirtualThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomVirtualThreads.java
index 6d93e2b02815..7c80d9334135 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomVirtualThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/LoomVirtualThreads.java
@@ -29,7 +29,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadFactory;
 
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.core.common.SuppressFBWarnings;
 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/thread/Parker.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/Parker.java
index 314a1437ad04..ecabc8500c96 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 1719c49879cb..12e36ec2727c 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
@@ -49,8 +49,8 @@
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 363329aacfae..a9a4071ae09d 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.PauseNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.extended.MembarNode;
-import org.graalvm.compiler.options.Option;
+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 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 1912484ff49f..f6d002d92c6b 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 0da2c3124d0f..a90052dc962e 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 8646492afd5f..51b19b2ebe52 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
@@ -32,8 +32,8 @@
 import java.util.Objects;
 import java.util.concurrent.ThreadFactory;
 
-import org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
+import jdk.compiler.graal.api.directives.GraalDirectives;
+import jdk.compiler.graal.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 f2162ce27810..4d82d085c9e3 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
@@ -30,7 +30,7 @@
 import java.util.Locale;
 import java.util.concurrent.Executor;
 
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 1a1b944ec578..674db772e042 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 8104fbb28c66..c7ef1f0debbc 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 a46e718d8c70..28f16f574a08 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 32f9f3d3bd15..75c6bf856e97 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 84adf8ca7fc8..3d023bbd1294 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 ea85580398f6..50258e258518 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 org.graalvm.compiler.api.directives.GraalDirectives;
-import org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.replacements.ReplacementsUtil;
-import org.graalvm.compiler.replacements.nodes.AssertionNode;
+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 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/thread/VirtualThreads.java b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VirtualThreads.java
index a098b39e474c..0019093facfe 100644
--- a/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VirtualThreads.java
+++ b/substratevm/src/com.oracle.svm.core/src/com/oracle/svm/core/thread/VirtualThreads.java
@@ -27,7 +27,7 @@
 import java.util.concurrent.Executor;
 import java.util.concurrent.ThreadFactory;
 
-import org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.api.replacements.Fold;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.word.Pointer;
 
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 761478db4757..be975b44ca87 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 org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.word.ObjectAccess;
+import jdk.compiler.graal.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 428019ac0811..edc89dc66285 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 28908f967626..3c564c9bf6f3 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeReader;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 ebab33d660a2..64edd7c0cd23 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 0dfca0dde382..d3efe723283c 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 4e8966844b2d..50f68d7f81e7 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 org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.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 259f2f00970a..48e9dccf0d8c 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 a1db02f16bcc..55862c6d0034 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 org.graalvm.compiler.core.common.util.AbstractTypeReader;
+import jdk.compiler.graal.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 ac7cf239ea80..344785d2d247 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 org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.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 3aa091dfef56..897d2e59ed5b 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 org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionStability;
+import jdk.compiler.graal.options.OptionDescriptor;
+import jdk.compiler.graal.options.OptionDescriptors;
+import jdk.compiler.graal.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.internal.vm.compiler", "org.graalvm.compiler.options");
+                        "jdk.internal.vm.compiler", "jdk.compiler.graal.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 92a1d53215ee..f11d98251d75 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 org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.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 909a27ca9415..46295fabe768 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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.serviceprovider.JavaVersionUtil;
 import org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.ProcessProperties;
 
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 b698da42b7cd..12c47b9163e2 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 org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.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 500152717611..cdccaf193690 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 org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.GlobalMetrics;
-import org.graalvm.compiler.hotspot.CompilationContext;
-import org.graalvm.compiler.hotspot.CompilationTask;
-import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl.CodeInfo;
-import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntime;
-import org.graalvm.compiler.hotspot.HotSpotGraalServices;
-import org.graalvm.compiler.hotspot.ProfileReplaySupport;
-import org.graalvm.compiler.hotspot.stubs.Stub;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.options.OptionsParser;
+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 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 org.graalvm.util.OptionsEncoder;
+import jdk.compiler.graal.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_org_graalvm_compiler_hotspot_test_LibGraalCompilerTest_hashConstantOopFields", include = LibGraalFeature.IsEnabled.class)
+    @CEntryPoint(name = "Java_jdk_compiler_graal_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 org.graalvm.compiler.hotspot.test.CompileTheWorld.compileMethodInLibgraal()}.
+     * {@code jdk.compiler.graal.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
@@ -331,12 +331,11 @@ private static long hashConstantOopFields(JNIEnv jniEnv,
      * @param timeAndMemBufferAddress 16-byte native buffer to store result of time and memory
      *            measurements of the compilation
      * @param profilePathBufferAddress native buffer containing a 0-terminated C string representing
-     *            {@link org.graalvm.compiler.hotspot.ProfileReplaySupport.Options#LoadProfiles}
-     *            path.
+     *            {@link ProfileReplaySupport.Options#LoadProfiles} path.
      * @return a handle to a {@link InstalledCode} in HotSpot's heap or 0 if compilation failed
      */
     @SuppressWarnings({"unused", "try"})
-    @CEntryPoint(name = "Java_org_graalvm_compiler_hotspot_test_CompileTheWorld_compileMethodInLibgraal", include = LibGraalFeature.IsEnabled.class)
+    @CEntryPoint(name = "Java_jdk_compiler_graal_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 0ca4dea64bb0..cfd12bd70125 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 org.graalvm.compiler.code.DisassemblerProvider;
-import org.graalvm.compiler.core.GraalServiceThread;
-import org.graalvm.compiler.core.common.spi.ForeignCallSignature;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.hotspot.EncodedSnippets;
-import org.graalvm.compiler.hotspot.HotSpotBackend;
-import org.graalvm.compiler.hotspot.HotSpotCodeCacheListener;
-import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl;
-import org.graalvm.compiler.hotspot.HotSpotForeignCallLinkageImpl.CodeInfo;
-import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
-import org.graalvm.compiler.hotspot.HotSpotGraalOptionValues;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntime;
-import org.graalvm.compiler.hotspot.HotSpotReplacementsImpl;
-import org.graalvm.compiler.hotspot.SnippetObjectConstant;
-import org.graalvm.compiler.hotspot.meta.HotSpotHostForeignCallsProvider;
-import org.graalvm.compiler.hotspot.meta.HotSpotInvocationPluginProvider;
-import org.graalvm.compiler.hotspot.meta.HotSpotProviders;
-import org.graalvm.compiler.hotspot.stubs.Stub;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory;
-import org.graalvm.compiler.nodes.spi.SnippetParameterInfo;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionDescriptorsMap;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.options.OptionsParser;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.serviceprovider.GlobalAtomicLong;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.serviceprovider.SpeculationReasonGroup;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluatorConfiguration;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
-import org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import org.graalvm.compiler.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import org.graalvm.compiler.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
+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.compiler.PartialEvaluatorConfiguration;
+import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
 import org.graalvm.jniutils.JNI;
 import org.graalvm.jniutils.JNIExceptionWrapper;
 import org.graalvm.jniutils.JNIMethodScope;
@@ -544,10 +544,8 @@ public void afterCompilation(AfterCompilationAccess access) {
     }
 
     /**
-     * Verifies that the Truffle compiler does not bring Truffle API types into an image. The
-     * Truffle compiler depends on {@code org.graalvm.compiler.truffle.options} which depends on the
-     * Truffle APIs to be able to use the {@code @com.oracle.truffle.api.Option} annotation. We need
-     * to use the points to analysis to verify that the Truffle API types are not reachable.
+     * Verifies that the Truffle compiler does not bring Truffle API types into an image. We need to
+     * use the points to analysis to verify that the Truffle API types are not reachable.
      */
     private static void verifyReachableTruffleClasses(AfterAnalysisAccess access) {
         AnalysisUniverse universe = ((FeatureImpl.AfterAnalysisAccessImpl) access).getUniverse();
@@ -631,7 +629,7 @@ static Object convertUnknownValue(Object object) {
 }
 
 @TargetClass(value = SpeculationReasonGroup.class, onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_serviceprovider_SpeculationReasonGroup {
+final class Target_jdk_compiler_graal_serviceprovider_SpeculationReasonGroup {
 
     /**
      * Delete this constructor to ensure {@link SpeculationReasonGroup} ids are in the libgraal
@@ -672,8 +670,8 @@ void constructor(Object object, boolean compressed) {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.hotspot.HotSpotGraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_hotspot_HotSpotGraalCompiler {
+@TargetClass(className = "jdk.compiler.graal.hotspot.HotSpotGraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_hotspot_HotSpotGraalCompiler {
 
     @SuppressWarnings({"unused", "try"})
     @Substitute
@@ -698,8 +696,8 @@ private static CompilationRequestResult compileMethod(HotSpotGraalCompiler compi
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.hotspot.HotSpotGraalRuntime", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_hotspot_HotSpotGraalRuntime {
+@TargetClass(className = "jdk.compiler.graal.hotspot.HotSpotGraalRuntime", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_hotspot_HotSpotGraalRuntime {
 
     @SuppressWarnings("unused")
     @Substitute
@@ -734,8 +732,8 @@ private static void shutdownLibGraal(HotSpotGraalRuntime runtime) {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.serviceprovider.GraalServices", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_serviceprovider_GraalServices {
+@TargetClass(className = "jdk.compiler.graal.serviceprovider.GraalServices", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_serviceprovider_GraalServices {
 
     @Substitute
     private static void notifyLowMemoryPoint(boolean fullGC) {
@@ -743,8 +741,8 @@ private static void notifyLowMemoryPoint(boolean fullGC) {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.hotspot.HotSpotGraalOptionValues", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_hotspot_HotSpotGraalOptionValues {
+@TargetClass(className = "jdk.compiler.graal.hotspot.HotSpotGraalOptionValues", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_hotspot_HotSpotGraalOptionValues {
     @Substitute
     private static OptionValues initializeOptions() {
         return HotSpotGraalOptionValuesUtil.initializeOptions();
@@ -808,8 +806,8 @@ private static String removePrefix(String value, String prefix) {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.core.GraalServiceThread", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_core_GraalServiceThread {
+@TargetClass(className = "jdk.compiler.graal.core.GraalServiceThread", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_core_GraalServiceThread {
     @Substitute()
     void beforeRun() {
         GraalServiceThread thread = SubstrateUtil.cast(this, GraalServiceThread.class);
@@ -825,8 +823,8 @@ void afterRun() {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.core.GraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_core_GraalCompiler {
+@TargetClass(className = "jdk.compiler.graal.core.GraalCompiler", onlyWith = LibGraalFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_core_GraalCompiler {
     @SuppressWarnings("unused")
     @Substitute()
     private static boolean notifyCrash(String crashMessage) {
@@ -852,13 +850,13 @@ private static boolean notifyCrash(String crashMessage) {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.hotspot.SymbolicSnippetEncoder", onlyWith = LibGraalFeature.IsEnabled.class)
+@TargetClass(className = "jdk.compiler.graal.hotspot.SymbolicSnippetEncoder", onlyWith = LibGraalFeature.IsEnabled.class)
 @Delete("shouldn't appear in libgraal")
-final class Target_org_graalvm_compiler_hotspot_SymbolicSnippetEncoder {
+final class Target_jdk_compiler_graal_hotspot_SymbolicSnippetEncoder {
 }
 
 @TargetClass(value = HotSpotForeignCallLinkageImpl.class, onlyWith = LibGraalFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_hotspot_HotSpotForeignCallLinkageImpl {
+final class Target_jdk_compiler_graal_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 185e29384448..67a89d3301b9 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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.hotspot.HotSpotGraalServices;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.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 9d3534349785..9240fb8b4d75 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 org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.serviceprovider.IsolateUtil;
+import jdk.compiler.graal.debug.TTY;
+import jdk.compiler.graal.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 c462c2ae8991..cbcf66645874 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 org.graalvm.compiler.core.common.util.MethodKey;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.TruffleElementCache;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
-import org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.compiler.graal.core.common.util.MethodKey;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
+import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.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 86177c3e6463..88c08314d914 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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.serviceprovider.GlobalAtomicLong;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.serviceprovider.GlobalAtomicLong;
+import jdk.compiler.graal.truffle.compiler.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 1eae250612a4..3e06970294d9 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 org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.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 7b3dbdc797bc..7248ff0d9354 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 org.graalvm.compiler.serviceprovider.IsolateUtil;
-import org.graalvm.compiler.serviceprovider.ServiceProvider;
+import jdk.compiler.graal.serviceprovider.IsolateUtil;
+import jdk.compiler.graal.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 17b822f577ad..f5b597d38449 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 org.graalvm.compiler.hotspot.CompilationContext;
-import org.graalvm.compiler.hotspot.HotSpotGraalServices;
-import org.graalvm.compiler.serviceprovider.IsolateUtil;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleCompilationSupport;
-import org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.compiler.graal.hotspot.CompilationContext;
+import jdk.compiler.graal.hotspot.HotSpotGraalServices;
+import jdk.compiler.graal.serviceprovider.IsolateUtil;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilationSupport;
+import jdk.compiler.graal.truffle.compiler.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 564d6cc5684b..fa24b404cd3e 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 org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.serviceprovider.UnencodedSpeculationReason;
+import jdk.compiler.graal.serviceprovider.GraalServices;
+import jdk.compiler.graal.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 1a4518e6e303..c957baa7d75b 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 org.graalvm.compiler.core.CompilationWrapper.ExceptionAction;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.gen.NodeMatchRules;
-import org.graalvm.compiler.core.match.MatchStatement;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugContext.Description;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.DiagnosticsOutputDirectory;
-import org.graalvm.compiler.debug.GlobalMetrics;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.CompositeValueClass;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.phases.LIRPhase;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.GraphDecoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.FloatingGuardPhase;
-import org.graalvm.compiler.phases.Speculative;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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 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 9e6071bb1ca5..c6446ca6a1c1 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 org.graalvm.compiler.graph.Node.ConstantNodeParameter;
+import static jdk.compiler.graal.graph.Node.ConstantNodeParameter;
 
 import java.util.Arrays;
 import java.util.EnumSet;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.gen.LIRGenerator;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 3f63c1525f01..2e91b1a60344 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.api.runtime.GraalRuntime;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.runtime.RuntimeProvider;
+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 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 9e16f322de77..9dcc9c7114fd 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.CompilationWatchDog;
-import org.graalvm.compiler.core.CompilationWrapper;
-import org.graalvm.compiler.core.CompilationWrapper.ExceptionAction;
-import org.graalvm.compiler.core.GraalCompiler;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.tiers.Suites;
+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 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 f7bc18331e7e..6d1579546a76 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 org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.aarch64.AArch64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 6e40bf55bf51..b45718bdc7fe 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 org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.amd64.AMD64LIRInstruction;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
+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 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 338317030550..8b5c6b701140 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 05037335e037..a4e1a9447145 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 org.graalvm.compiler.core.common.FieldIntrospection;
-import org.graalvm.compiler.core.common.Fields;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.CompositeValue;
-import org.graalvm.compiler.lir.CompositeValueClass;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
+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 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 715ed8332135..d01b4cf1b873 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.api.runtime.GraalRuntime;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.debug.MetricKey;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotBackendFactory;
-import org.graalvm.compiler.hotspot.SnippetResolvedJavaMethod;
-import org.graalvm.compiler.hotspot.SnippetResolvedJavaType;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 e8fd22e36a90..a678e782ce4e 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.phases.DeoptimizeOnExceptionPhase;
-import org.graalvm.compiler.word.WordTypes;
+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.compiler.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.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 acd16457e3c3..3a51e48b4810 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 2c6d9cbbdd52..274be546564e 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 org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
+import static jdk.compiler.graal.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -46,42 +46,8 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
+import jdk.compiler.graal.graph.NodeSourcePosition;
 import org.graalvm.collections.EconomicMap;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.IterativeConditionalEliminationPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.truffle.compiler.phases.DeoptimizeOnExceptionPhase;
-import org.graalvm.compiler.word.WordTypes;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.Feature;
 
@@ -130,6 +96,40 @@
 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.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.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.compiler.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.word.WordTypes;
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.BytecodePosition;
 import jdk.vm.ci.meta.JavaKind;
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 6eb6a9b4db28..e52b07270260 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 org.graalvm.compiler.api.runtime.GraalRuntime;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.word.WordTypes;
+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 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 7679ee435702..a9e97d7504f2 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 org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.nodes.spi.LoopsDataProvider;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 4cd65b52da28..b4fc73dccb66 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
+import jdk.compiler.graal.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 e2599ea75021..8b7f779c0b90 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 org.graalvm.compiler.core.common.CompilationIdentifier;
+import jdk.compiler.graal.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 08dc95d8c4a0..2c89628638f6 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
@@ -24,15 +24,16 @@
  */
 package com.oracle.svm.graal.isolated;
 
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetCounter;
-import org.graalvm.compiler.replacements.SnippetIntegerHistogram;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+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 com.oracle.svm.core.ParsingReason;
 import com.oracle.svm.core.SubstrateOptions;
@@ -44,7 +45,7 @@
 import jdk.vm.ci.meta.ResolvedJavaField;
 
 /**
- * Adapted from code of {@link org.graalvm.compiler.hotspot.SymbolicSnippetEncoder}.
+ * Adapted from code of {@link SymbolicSnippetEncoder}.
  */
 final class DisableSnippetCountersPlugin implements NodePlugin {
     private static final String snippetCounterName = 'L' + SnippetCounter.class.getName().replace('.', '/') + ';';
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 d31dedb2117e..eef4738d4d62 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 e0f05efa63f6..7ea21ded7999 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 org.graalvm.compiler.code.CompilationResult;
+import jdk.compiler.graal.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 e2afce0d79d1..e117b665887c 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 org.graalvm.compiler.core.common.CompressEncoding;
+import jdk.compiler.graal.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 8999288a9b0c..299cf888de78 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 d5d15917046c..8b5f2da9eb44 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 56fad4531c3f..cccfd6a9e733 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugOptions;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionsParser;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+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 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 852678c90474..dccc3207645a 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.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 3c74b26edf6a..880d253de745 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 org.graalvm.compiler.serviceprovider.UnencodedSpeculationReason;
+import jdk.compiler.graal.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 c4156ecbfa59..14017b4e59fc 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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.util.TypedDataInputStream;
-import org.graalvm.util.TypedDataOutputStream;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.util.TypedDataInputStream;
+import jdk.compiler.graal.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 263c1d10fa67..5ee68a70d68d 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 org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeReader;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+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 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 278cc52cf818..a7199ec4f5ed 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
+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.compiler.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 30af4bd51256..47a8fde046b4 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
+import jdk.compiler.graal.code.CompilationResult;
+import jdk.compiler.graal.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 c9074992b320..f843afc75a79 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 org.graalvm.compiler.core.common.spi.JavaConstantFieldProvider;
+import jdk.compiler.graal.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 b071e10c5e9f..8cce95405491 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 org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.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 3d3c9a178d1e..44e47a2180ac 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 org.graalvm.compiler.core.common.CompilationIdentifier;
+import jdk.compiler.graal.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 880f622589c3..a26610ed0e67 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 org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.word.BarrieredAccess;
+import jdk.compiler.graal.core.common.CompressEncoding;
+import jdk.compiler.graal.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 9f0f107fb5f9..f75935656f73 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.util.TypeConversion;
+import jdk.compiler.graal.api.replacements.Snippet;
+import jdk.compiler.graal.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 ccaceb1d75f6..e6c17c3079e4 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.ReplacementsImpl;
-import org.graalvm.compiler.word.WordTypes;
+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 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 f234d7cba6eb..a55ce3636859 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 org.graalvm.compiler.replacements.StringLatin1InflateNode;
-import org.graalvm.compiler.replacements.StringUTF16CompressNode;
-import org.graalvm.compiler.replacements.nodes.AESNode;
-import org.graalvm.compiler.replacements.nodes.ArrayCompareToForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsWithMaskForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToForeignCalls;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode;
-import org.graalvm.compiler.replacements.nodes.CalcStringAttributesForeignCalls;
-import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode;
-import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode;
-import org.graalvm.compiler.replacements.nodes.CountPositivesNode;
-import org.graalvm.compiler.replacements.nodes.CounterModeAESNode;
-import org.graalvm.compiler.replacements.nodes.EncodeArrayNode;
-import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.MD5Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA3Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
-import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode;
+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 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 2ffe4c9d27f4..d0fabd6de0a8 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 org.graalvm.compiler.replacements.StringLatin1InflateNode;
-import org.graalvm.compiler.replacements.StringUTF16CompressNode;
-import org.graalvm.compiler.replacements.nodes.AESNode;
-import org.graalvm.compiler.replacements.nodes.ArrayCompareToForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsWithMaskForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfForeignCalls;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToForeignCalls;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode;
-import org.graalvm.compiler.replacements.nodes.CalcStringAttributesForeignCalls;
-import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode;
-import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode;
-import org.graalvm.compiler.replacements.nodes.CountPositivesNode;
-import org.graalvm.compiler.replacements.nodes.CounterModeAESNode;
-import org.graalvm.compiler.replacements.nodes.EncodeArrayNode;
-import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.MD5Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
-import org.graalvm.compiler.replacements.nodes.VectorizedHashCodeNode;
-import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode;
+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 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 da05eb1379ae..a81a16b724d8 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 org.graalvm.compiler.lir.GeneratedStubsHolder;
-import org.graalvm.compiler.replacements.StringLatin1InflateNode;
-import org.graalvm.compiler.replacements.StringUTF16CompressNode;
-import org.graalvm.compiler.replacements.nodes.AESNode;
-import org.graalvm.compiler.replacements.nodes.ArrayCompareToNode;
-import org.graalvm.compiler.replacements.nodes.ArrayCopyWithConversionsNode;
-import org.graalvm.compiler.replacements.nodes.ArrayEqualsNode;
-import org.graalvm.compiler.replacements.nodes.ArrayIndexOfNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionCompareToNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsWithMaskNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMulAddNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerMultiplyToLenNode;
-import org.graalvm.compiler.replacements.nodes.BigIntegerSquareToLenNode;
-import org.graalvm.compiler.replacements.nodes.CalcStringAttributesNode;
-import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode;
-import org.graalvm.compiler.replacements.nodes.CountPositivesNode;
-import org.graalvm.compiler.replacements.nodes.CounterModeAESNode;
-import org.graalvm.compiler.replacements.nodes.EncodeArrayNode;
-import org.graalvm.compiler.replacements.nodes.GHASHProcessBlocksNode;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.MD5Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA1Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA256Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA3Node;
-import org.graalvm.compiler.replacements.nodes.MessageDigestNode.SHA512Node;
-import org.graalvm.compiler.replacements.nodes.VectorizedHashCodeNode;
-import org.graalvm.compiler.replacements.nodes.VectorizedMismatchNode;
+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;
 
 @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 37f57a6b38c2..e0d6ffa27c2a 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.replacements.nodes.ArrayRegionEqualsNode;
+import jdk.compiler.graal.core.common.spi.ForeignCallDescriptor;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.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 a1269bfd7937..54c62e4be437 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,34 +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 org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.Equivalence;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.core.gen.NodeLIRBuilder;
-import org.graalvm.compiler.core.match.MatchStatement;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.MetricKey;
-import org.graalvm.compiler.debug.TimeSource;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.lir.CompositeValue;
-import org.graalvm.compiler.lir.CompositeValueClass;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.LIRInstructionClass;
-import org.graalvm.compiler.lir.gen.ArithmeticLIRGeneratorTool;
-import org.graalvm.compiler.lir.phases.LIRPhase;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.printer.NoDeadCodeVerifyHandler;
-import org.graalvm.compiler.serviceprovider.GlobalAtomicLong;
+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 org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.ImageSingletons;
 import org.graalvm.nativeimage.hosted.FieldValueTransformer;
@@ -93,8 +102,8 @@
 import jdk.vm.ci.code.TargetDescription;
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
-@TargetClass(value = org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
-final class Target_org_graalvm_compiler_nodes_graphbuilderconf_InvocationPlugins {
+@TargetClass(value = InvocationPlugins.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
+final class Target_jdk_compiler_graal_nodes_graphbuilderconf_InvocationPlugins {
 
     @Alias//
     private List deferredRegistrations = new ArrayList<>();
@@ -107,9 +116,9 @@ private void flushDeferrables() {
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.phases.common.inlining.info.elem.InlineableGraph.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
+@TargetClass(value = InlineableGraph.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"unused"})
-final class Target_org_graalvm_compiler_phases_common_inlining_info_elem_InlineableGraph {
+final class Target_jdk_compiler_graal_phases_common_inlining_info_elem_InlineableGraph {
 
     @Substitute
     private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTierContext context, CanonicalizerPhase canonicalizer, StructuredGraph caller, boolean trackNodeSourcePosition) {
@@ -121,9 +130,9 @@ private static StructuredGraph parseBytecodes(ResolvedJavaMethod method, HighTie
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.phases.common.inlining.walker.ComputeInliningRelevance.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
+@TargetClass(value = ComputeInliningRelevance.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"static-method", "unused"})
-final class Target_org_graalvm_compiler_phases_common_inlining_walker_ComputeInliningRelevance {
+final class Target_jdk_compiler_graal_phases_common_inlining_walker_ComputeInliningRelevance {
 
     @Substitute
     private void compute() {
@@ -140,11 +149,11 @@ public double getRelevance(Invoke invoke) {
 }
 
 @TargetClass(value = DebugContext.class, innerClass = "Invariants", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_debug_DebugContext_Invariants {
+final class Target_jdk_compiler_graal_debug_DebugContext_Invariants {
 }
 
 @TargetClass(value = DebugContext.class, innerClass = "Immutable", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_debug_DebugContext_Immutable {
+final class Target_jdk_compiler_graal_debug_DebugContext_Immutable {
     static class ClearImmutableCache implements FieldValueTransformer {
         @Override
         public Object transform(Object receiver, Object originalValue) {
@@ -170,11 +179,11 @@ public Object transform(Object receiver, Object originalValue) {
      */
     @Alias//
     @RecomputeFieldValue(kind = Custom, declClass = ClearImmutableCache.class)//
-    private static Target_org_graalvm_compiler_debug_DebugContext_Immutable[] CACHE;
+    private static Target_jdk_compiler_graal_debug_DebugContext_Immutable[] CACHE;
 }
 
 @TargetClass(value = DebugHandlersFactory.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_debug_DebugHandlersFactory {
+final class Target_jdk_compiler_graal_debug_DebugHandlersFactory {
     static class CachedFactories implements FieldValueTransformer {
         @Override
         public Object transform(Object receiver, Object originalValue) {
@@ -192,7 +201,7 @@ public Object transform(Object receiver, Object originalValue) {
 }
 
 @TargetClass(value = TimeSource.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_debug_TimeSource {
+final class Target_jdk_compiler_graal_debug_TimeSource {
     // Checkstyle: stop
     @Alias//
     @RecomputeFieldValue(kind = FromAlias)//
@@ -200,16 +209,16 @@ final class Target_org_graalvm_compiler_debug_TimeSource {
     // Checkstyle: resume
 }
 
-@TargetClass(value = org.graalvm.compiler.debug.TTY.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
-final class Target_org_graalvm_compiler_debug_TTY {
+@TargetClass(value = TTY.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
+final class Target_jdk_compiler_graal_debug_TTY {
 
     @Alias//
     @RecomputeFieldValue(kind = FromAlias)//
     private static PrintStream out = Log.logStream();
 }
 
-@TargetClass(className = "org.graalvm.compiler.serviceprovider.IsolateUtil", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_serviceprovider_IsolateUtil {
+@TargetClass(className = "jdk.compiler.graal.serviceprovider.IsolateUtil", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_serviceprovider_IsolateUtil {
 
     @Substitute
     public static long getIsolateAddress() {
@@ -230,8 +239,8 @@ public Object transform(Object receiver, Object originalValue) {
     }
 }
 
-@TargetClass(className = "org.graalvm.compiler.serviceprovider.GlobalAtomicLong", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_serviceprovider_GlobalAtomicLong {
+@TargetClass(className = "jdk.compiler.graal.serviceprovider.GlobalAtomicLong", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_serviceprovider_GlobalAtomicLong {
 
     @Inject//
     @RecomputeFieldValue(kind = Kind.Custom, declClass = GlobalAtomicLongAddressProvider.class) //
@@ -262,8 +271,8 @@ private long getAddress() {
  * The following substitutions replace methods where reflection is used in the Graal code.
  */
 
-@TargetClass(value = org.graalvm.compiler.debug.KeyRegistry.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_debug_KeyRegistry {
+@TargetClass(value = KeyRegistry.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_debug_KeyRegistry {
 
     @Alias//
     @RecomputeFieldValue(kind = FromAlias)//
@@ -274,8 +283,8 @@ final class Target_org_graalvm_compiler_debug_KeyRegistry {
     private static List keys = new ArrayList<>();
 }
 
-@TargetClass(value = org.graalvm.compiler.core.match.MatchRuleRegistry.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_core_match_MatchRuleRegistry {
+@TargetClass(value = MatchRuleRegistry.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_core_match_MatchRuleRegistry {
 
     @Substitute
     public static EconomicMap, List> lookup(Class theClass, @SuppressWarnings("unused") OptionValues options,
@@ -288,9 +297,9 @@ public static EconomicMap, List> lookup(Cl
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.replacements.nodes.BinaryMathIntrinsicNode.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
+@TargetClass(value = BinaryMathIntrinsicNode.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"unused", "static-method"})
-final class Target_org_graalvm_compiler_replacements_nodes_BinaryMathIntrinsicNode {
+final class Target_jdk_compiler_graal_replacements_nodes_BinaryMathIntrinsicNode {
 
     /*
      * The node is lowered to a foreign call, the LIR generation is only used for the compilation of
@@ -304,9 +313,9 @@ void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.replacements.nodes.UnaryMathIntrinsicNode.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
+@TargetClass(value = UnaryMathIntrinsicNode.class, onlyWith = RuntimeCompilationFeature.IsEnabledAndNotLibgraal.class)
 @SuppressWarnings({"unused", "static-method"})
-final class Target_org_graalvm_compiler_replacements_nodes_UnaryMathIntrinsicNode {
+final class Target_jdk_compiler_graal_replacements_nodes_UnaryMathIntrinsicNode {
 
     @Substitute
     void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
@@ -314,8 +323,8 @@ void generate(NodeLIRBuilderTool nodeValueMap, ArithmeticLIRGeneratorTool gen) {
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.phases.BasePhase.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_phases_BasePhase {
+@TargetClass(value = BasePhase.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_phases_BasePhase {
 
     @Substitute
     static BasePhase.BasePhaseStatistics getBasePhaseStatistics(Class clazz) {
@@ -327,8 +336,8 @@ static BasePhase.BasePhaseStatistics getBasePhaseStatistics(Class clazz) {
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.lir.phases.LIRPhase.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_lir_phases_LIRPhase {
+@TargetClass(value = LIRPhase.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_lir_phases_LIRPhase {
 
     @Substitute
     static LIRPhase.LIRPhaseStatistics getLIRPhaseStatistics(Class clazz) {
@@ -340,8 +349,8 @@ static LIRPhase.LIRPhaseStatistics getLIRPhaseStatistics(Class clazz) {
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.graph.NodeClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_graph_NodeClass {
+@TargetClass(value = NodeClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_graph_NodeClass {
 
     @Alias//
     @RecomputeFieldValue(kind = RecomputeFieldValue.Kind.Custom, declClass = FieldsOffsetsFeature.InputsIterationMaskRecomputation.class)//
@@ -372,8 +381,8 @@ public String shortName() {
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.lir.LIRInstructionClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_lir_LIRInstructionClass {
+@TargetClass(value = LIRInstructionClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_lir_LIRInstructionClass {
 
     @Substitute
     @SuppressWarnings("unlikely-arg-type")
@@ -387,8 +396,8 @@ public static LIRInstructionClass get(Class clazz)
     }
 }
 
-@TargetClass(value = org.graalvm.compiler.lir.CompositeValueClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_lir_CompositeValueClass {
+@TargetClass(value = CompositeValueClass.class, onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_lir_CompositeValueClass {
 
     @Substitute
     @SuppressWarnings("unlikely-arg-type")
@@ -403,14 +412,14 @@ public static CompositeValueClass get(Class clazz)
 }
 
 @TargetClass(value = NoDeadCodeVerifyHandler.class)
-final class Target_org_graalvm_compiler_printer_NoDeadCodeVerifyHandler {
+final class Target_jdk_compiler_graal_printer_NoDeadCodeVerifyHandler {
     @Alias//
     @RecomputeFieldValue(kind = Kind.NewInstance, declClass = ConcurrentHashMap.class)//
     private static Map discovered;
 }
 
-@TargetClass(value = org.graalvm.compiler.nodes.NamedLocationIdentity.class, innerClass = "DB", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
-final class Target_org_graalvm_compiler_nodes_NamedLocationIdentity_DB {
+@TargetClass(value = NamedLocationIdentity.class, innerClass = "DB", onlyWith = RuntimeCompilationFeature.IsEnabled.class)
+final class Target_jdk_compiler_graal_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 3fdee5dd38f7..cf48588fb51c 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 37266ae57e50..f70ce98280ee 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 ad788a879fbe..a05d51150c72 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 38969b47ca16..2f2267b54853 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 f98303284f08..46d4cd131f00 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+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 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 b4b9c659551b..70c7c04ac37c 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 acf96119b0e1..64f83e160cc7 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 9b9fa899fca9..63d26c1b0ca8 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
+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 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 39a4fb52629c..1547b12f8b77 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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.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 5cfd2d61a539..dc272eb547b9 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 656786efba0e..dc16992722c1 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 edaf09a1fb1b..f133793f1a70 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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.options.OptionValues;
 import org.graalvm.nativeimage.impl.AnnotationExtractor;
 
 import com.oracle.svm.core.NativeImageClassLoaderOptions;
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 86fcb11ab63f..a1d2969b212e 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 org.graalvm.compiler.hotspot.JVMCIVersionCheck.OPEN_LABSJDK_RELEASE_URL_PATTERN;
-import static org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.registerInvocationPlugins;
+import static jdk.compiler.graal.hotspot.JVMCIVersionCheck.OPEN_LABSJDK_RELEASE_URL_PATTERN;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.util.CompilationAlarm;
-import org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.DebugDumpScope;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.hotspot.GraalHotSpotVMConfig;
-import org.graalvm.compiler.hotspot.HotSpotGraalCompiler;
-import org.graalvm.compiler.hotspot.HotSpotGraalRuntimeProvider;
-import org.graalvm.compiler.java.BciBlockMapping;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.loop.phases.ConvertDeoptimizeToGuardPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.gc.BarrierSet;
-import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedPluginFactory;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.FloatingGuardPhase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.Speculative;
-import org.graalvm.compiler.phases.common.AddressLoweringPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.common.DeoptimizationGroupingPhase;
-import org.graalvm.compiler.phases.common.FrameStateAssignmentPhase;
-import org.graalvm.compiler.phases.common.LoopSafepointInsertionPhase;
-import org.graalvm.compiler.phases.common.inlining.InliningPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.replacements.MethodHandleWithExceptionPlugin;
-import org.graalvm.compiler.replacements.NodeIntrinsificationProvider;
-import org.graalvm.compiler.replacements.TargetGraphBuilderPlugins;
-import org.graalvm.compiler.word.WordOperationPlugin;
-import org.graalvm.compiler.word.WordTypes;
+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 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 bd2e6794828a..8fbe68569445 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 org.graalvm.compiler.core.riscv64.ShadowedRISCV64;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+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 org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 import org.graalvm.nativeimage.c.type.CCharPointerPointer;
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 a46c03f0e023..a5c6da837e8a 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 org.graalvm.compiler.options.OptionType.Debug;
-import static org.graalvm.compiler.options.OptionType.User;
+import static jdk.compiler.graal.options.OptionType.Debug;
+import static jdk.compiler.graal.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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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 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 e505d00ad9d4..34193a3f3ff7 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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.serviceprovider.GraalServices;
+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 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 b08b713712cd..5ef5fb404011 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 org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil;
+import jdk.compiler.graal.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 75a9b53cf9c9..cb0a3f0fc8ab 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,15 +24,16 @@
  */
 package com.oracle.svm.hosted;
 
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
+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 com.oracle.graal.pointsto.util.AnalysisFuture;
 import com.oracle.svm.core.BuildPhaseProvider;
@@ -58,10 +59,8 @@
  *
  * To use:
  * 
      
- * 
    1. Create a subclass of
- * {@link org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin}
- * that is also a decorator
- * (override @{@link org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin#isDecorator()})
      2. 
+ * 
    2. Create a subclass of {@link InvocationPlugin.RequiredInvocationPlugin} that is also a
+ * decorator (override @{@link InvocationPlugin.RequiredInvocationPlugin#isDecorator()})
      3. 
  * 
    3. When applying the plugin, add this node to the graph with a @{link {@link Runnable} that
  * registers the metadata.}
      4. 
  * 
    
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 3f8c1a54281e..46f500987f61 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 aefbba5a9b03..b273ee4a5818 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 org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.java.GraphBuilderPhase.Instance;
-import org.graalvm.compiler.nodes.StaticDeoptimizingNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.java.AccessFieldNode;
-import org.graalvm.compiler.nodes.java.AccessMonitorNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.BoxNodeIdentityPhase;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
+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 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 1f3fbd56ea58..222cad049dd2 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 8f1cfc4b0616..234bc520ab2b 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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",
-                    "org.graalvm.compiler.hotspot.CompilerConfigurationFactory",
-                    "org.graalvm.compiler.hotspot.HotSpotBackendFactory",
-                    "org.graalvm.compiler.hotspot.meta.DefaultHotSpotLoweringProvider$Extensions",
-                    "org.graalvm.compiler.hotspot.meta.HotSpotInvocationPluginProvider",
-                    "org.graalvm.compiler.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory");
+                    "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");
 
     // 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 */
-                    "org.graalvm.compiler.hotspot.meta.HotSpotDisassemblerProvider",
+                    "jdk.compiler.graal.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 5b26353be5a8..187467f74f36 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 f79916bbcd42..b6409848061c 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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 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 1234901733ec..9aaa6bc96f41 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 org.graalvm.compiler.core.common.type.TypedConstant;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.core.common.type.TypedConstant;
+import jdk.compiler.graal.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 62cca84fd57b..120b85ad4102 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 693d417102db..9c3acce90b90 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 org.graalvm.compiler.core.common.SuppressSVMWarnings;
+import jdk.compiler.graal.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 475e489c59f4..fb6c1af69b3e 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 35a3dde8c569..8978d4dc9854 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 a196af98773b..7830ab86e1a7 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 org.graalvm.compiler.debug.MethodFilter;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.debug.MethodFilter;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 ba2722bff031..b745c284d762 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 18068cf345ea..f8071aa604dd 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 053139a10d37..2d1d9a4027fc 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 org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
+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 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 b10c03ca4ecb..3a868a141048 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 50c55eb03449..674707879f3a 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 f09997b777d5..f5d114e6cea0 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 d8e6acb6c5b6..b64cc9a4266b 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 2387b1cb12cb..a345265323aa 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 d3ba754a1aa6..3a31ee6b8217 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 f6ca7ac35065..1f400326c26a 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 org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NamedLocationIdentity;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.memory.ReadNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 937bc51403e4..e7e98bc6f6da 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.hotspot.JVMCIVersionCheck;
-import org.graalvm.compiler.word.BarrieredAccess;
-import org.graalvm.compiler.word.ObjectAccess;
-import org.graalvm.compiler.word.Word;
+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 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 1214fe766409..c26e0a7afc85 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 org.graalvm.compiler.core.riscv64.RISCV64ReflectionUtil;
-import org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.core.riscv64.RISCV64ReflectionUtil;
+import jdk.compiler.graal.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 1b92e7a3288f..24676fd4d675 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.StateSplitProxyNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 00ddaf6b6bd9..d125516be323 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 org.graalvm.compiler.bytecode.BridgeMethodUtils;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.bytecode.BridgeMethodUtils;
+import jdk.compiler.graal.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 c59c61dd993c..079eebc3992c 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 2f67dea320e8..ca70bf09ccbd 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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 0794aed3ce75..1125d2766b3e 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 e1d88d3869d4..82124effa5b8 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.java.LambdaUtils;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+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 org.graalvm.nativeimage.impl.clinit.ClassInitializationTracking;
 
 import com.oracle.graal.pointsto.constraints.UnsupportedFeatureException;
@@ -99,15 +99,13 @@ 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("org.graalvm.compiler", NATIVE_IMAGE_CLASS_REASON);
+        initializationSupport.initializeAtBuildTime("jdk.compiler.graal", 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);
-        initializationSupport.initializeAtBuildTime("org.graalvm.util", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.home", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.polyglot", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.options", NATIVE_IMAGE_CLASS_REASON);
-        initializationSupport.initializeAtBuildTime("org.graalvm.graphio", NATIVE_IMAGE_CLASS_REASON);
         initializationSupport.initializeAtBuildTime("org.graalvm.jniutils", 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 9636161cb637..45ebd9853676 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 d310bf77fd57..8c80cc235e97 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 ef3f598940db..aece10072b5b 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 org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
+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 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 b6eab87e34d6..229e55c879e7 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 org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.compiler.graal.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
 
 import java.lang.reflect.Proxy;
 import java.util.HashSet;
 import java.util.Set;
 import java.util.function.Supplier;
 
-import org.graalvm.compiler.core.common.GraalBailoutException;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.graph.Graph;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.UnsafeAccessNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.java.AccessFieldNode;
-import org.graalvm.compiler.nodes.java.AccessMonitorNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 63e7a0175f66..141a862b2846 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 org.graalvm.compiler.core.common.GraalBailoutException;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.core.common.GraalBailoutException;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 11cc46472653..b945c51642b8 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 org.graalvm.compiler.core.common.type.TypedConstant;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ControlSplitNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BoxNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin.LoopExplosionKind;
-import org.graalvm.compiler.nodes.java.AccessMonitorNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualBoxingNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.replacements.arraycopy.ArrayCopyNode;
-import org.graalvm.compiler.replacements.nodes.ObjectClone;
+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 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 652efb568bbc..33f27282e5a8 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,13 +24,7 @@
  */
 package com.oracle.svm.hosted.classinitialization;
 
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.compiler.graal.graph.NodeSourcePosition;
 import org.graalvm.nativeimage.AnnotationAccess;
 
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
@@ -42,6 +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.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 345f54194859..d34cc1a31bdb 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 org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.UnreachableControlSinkNode;
-import org.graalvm.compiler.nodes.VirtualState;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.FinalFieldBarrierNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
+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 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 69714a117d97..18cc563a2d47 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 org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode;
-import org.graalvm.compiler.core.common.Fields;
-import org.graalvm.compiler.core.common.GraalOptions;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FieldLocationIdentity;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualInstanceNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectState;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.replacements.SnippetTemplate;
+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 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 4dc29f89fdb7..a94ce6c4a9b5 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 1d0f8c20f397..9aff43033e8b 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 org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeadEndNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
+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 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 0d3bd8fe704f..d78b60539899 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 org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
+import jdk.compiler.graal.nodes.ConstantNode;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.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 f03c2c7655b7..bfd6aabd193d 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 7072611b1cd2..47a56c03584c 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 org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.graph.Node.NodeIntrinsic;
+import jdk.compiler.graal.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 b1fd768d498e..3b0212f8a509 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 2736b88fe549..785e21a396a7 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 org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.GraphEncoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+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 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 cfd607bc22df..46ab9140bd92 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.GraphDecoder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.options.OptionValues;
+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 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 9646ea0c05bd..5a897ce00248 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecode;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.DataSection;
-import org.graalvm.compiler.core.GraalCompiler;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.CompilationIdentifier.Verbosity;
-import org.graalvm.compiler.core.common.spi.CodeGenProviders;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Description;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.debug.GlobalMetrics;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.debug.TTY;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.java.StableMethodNameFormatter;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilder;
-import org.graalvm.compiler.lir.asm.CompilationResultBuilderFactory;
-import org.graalvm.compiler.lir.asm.DataBuilder;
-import org.graalvm.compiler.lir.asm.FrameContext;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.GraphState.GuardsStage;
-import org.graalvm.compiler.nodes.GraphState.StageFlag;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedFoldInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.BytecodeExceptionMode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.GraphOrder;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
-import org.graalvm.compiler.replacements.nodes.MacroInvokable;
+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 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 c8da2490dad0..d09f3f0cb835 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.iterators.NodePredicate;
-import org.graalvm.compiler.graph.iterators.NodePredicates;
-import org.graalvm.compiler.lir.RedundantMoveElimination;
-import org.graalvm.compiler.lir.alloc.RegisterAllocationPhase;
-import org.graalvm.compiler.lir.phases.LIRPhase;
-import org.graalvm.compiler.lir.phases.LIRSuites;
-import org.graalvm.compiler.lir.phases.PostAllocationOptimizationPhase;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.BasePhase;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.common.BoxNodeOptimizationPhase;
-import org.graalvm.compiler.phases.common.FixReadsPhase;
-import org.graalvm.compiler.phases.common.FloatingReadPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.tiers.LowTierContext;
-import org.graalvm.compiler.phases.tiers.MidTierContext;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.virtual.phases.ea.PartialEscapePhase;
-import org.graalvm.compiler.virtual.phases.ea.ReadEliminationPhase;
+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 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 01084b46b0c6..91e50a8f178c 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
+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 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 31c6e9342c7b..e9a40b16cab8 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 org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
+import jdk.compiler.graal.nodes.java.AbstractNewObjectNode;
+import jdk.compiler.graal.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 f80ae708e917..c60e418079d0 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 org.graalvm.compiler.code.CompilationResult;
+import jdk.compiler.graal.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 c002a45c3709..cfe8bebb6741 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.word.WordTypes;
+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 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 ab8c85d4c6a4..865adbb14cf8 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.bytecode.ResolvedJavaMethodBytecodeProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.word.WordTypes;
+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 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 2ccd3ad66e76..f985cb09a055 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
+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 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 44c4f0245e60..b77d8fd6ae18 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.replacements.nodes.MethodHandleWithExceptionNode;
+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 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 cc6773d60988..43314ebe9f2a 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 org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.word.Word.Operation;
+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 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 1ec37da29ffb..9a70c3b88d00 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.graph.NodeSourcePosition;
+import jdk.compiler.graal.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 fd74563ed893..e897b132cff1 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
-import org.graalvm.compiler.core.common.spi.ForeignCallsProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.debug.DebugHandlersFactory;
-import org.graalvm.compiler.nodes.spi.LoopsDataProvider;
-import org.graalvm.compiler.nodes.spi.LoweringProvider;
-import org.graalvm.compiler.nodes.spi.PlatformConfigurationProvider;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.spi.StampProvider;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.serviceprovider.GraalServices;
-import org.graalvm.compiler.word.WordTypes;
+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 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 c282ec72a79d..a55c1b1efdd0 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 org.graalvm.compiler.debug.Assertions;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
+import jdk.compiler.graal.debug.Assertions;
+import jdk.compiler.graal.nodes.FrameState;
+import jdk.compiler.graal.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 593e3ef4530e..0f4190e40c9e 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 org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.GraphBuilderPhase.Instance;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.ReplacementsImpl;
-import org.graalvm.compiler.replacements.ReplacementsImpl.GraphMaker;
-import org.graalvm.compiler.word.WordTypes;
+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 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 aace232d48ce..8804009b635a 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 org.graalvm.compiler.replacements.ReplacementsImpl;
-import org.graalvm.compiler.replacements.ReplacementsImpl.GraphMaker;
-import org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.replacements.ReplacementsImpl;
+import jdk.compiler.graal.replacements.ReplacementsImpl.GraphMaker;
+import jdk.compiler.graal.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 2f9d1cc51d3a..e00e808d8bf4 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.compiler.graal.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 4997851d4f08..57bf7aad9944 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.java.LoadExceptionObjectNode;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 08e15c3f6bcc..2a541239e91d 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.NewMultiArrayNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionsParser;
+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 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 f926ba12002d..9c95a0c66055 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 org.graalvm.compiler.asm.Assembler.CodeAnnotation;
-import org.graalvm.compiler.asm.aarch64.AArch64Assembler.SingleInstructionAnnotation;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler.MovSequenceAnnotation.MovAction;
-import org.graalvm.compiler.code.CompilationResult;
+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 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 5197a9685399..9d162cc44045 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 org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.asm.aarch64.AArch64MacroAssembler;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.NumUtil;
+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 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 af515906bb07..ed32cb9746f2 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 org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.AddressDisplacementAnnotation;
-import org.graalvm.compiler.asm.amd64.AMD64BaseAssembler.OperandDataAnnotation;
-import org.graalvm.compiler.code.CompilationResult;
+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 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 2056060b5d7a..820a91ab7421 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 org.graalvm.compiler.asm.Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64Assembler;
-import org.graalvm.compiler.asm.amd64.AMD64MacroAssembler;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.NumUtil;
+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 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 fde6041471ee..93f3ff2a612f 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 b55d6c1e33d4..426bc32ee1cc 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 7bd09002a6a6..9ec3d3ea6b86 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 org.graalvm.compiler.api.replacements.Fold;
+import jdk.compiler.graal.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 00a6abd25285..5e4aa158e4f1 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 org.graalvm.graphio.GraphOutput;
-import org.graalvm.graphio.GraphStructure;
+import jdk.compiler.graal.graphio.GraphOutput;
+import jdk.compiler.graal.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 c8c576daba9c..0241924a6a08 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 f3d4f4c29238..75a48c836b3b 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 org.graalvm.graphio.GraphOutput;
-import org.graalvm.graphio.GraphStructure;
+import jdk.compiler.graal.graphio.GraphOutput;
+import jdk.compiler.graal.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 2e1373009e0e..6d375eb790d6 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 e97fc6d3da50..4a10ca69fe62 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.LoadIndexedNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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 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 326ab2907657..ed3528fe6a6a 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractStateSplit;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.spi.Simplifiable;
-import org.graalvm.compiler.nodes.spi.SimplifierTool;
+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 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 05104bf98276..7e4cbb4bf7f4 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 6810029380c5..0c3b96f87fee 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 org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 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 e4b31f9515eb..f2e93640ad95 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 org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.compiler.graal.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 334062cb642c..b597147a647e 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 org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.compiler.graal.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 a60f30eb92ec..339454b6a2bb 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
+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 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 3b47aec8a657..5a1ab1ef1fc2 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.TypedConstant;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 a8964710b77a..6a18a08f1754 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 14de7653ec1b..2d2e6b7d8b01 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionStability;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 3fe46d22b641..c4d27d093d00 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 839041d5fe6a..52d04393a547 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 org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 783637b1ae5e..de31e57b7c38 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.CompilationResult.CodeAnnotation;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
+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 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 adcd21f5c6a4..a2c45b1deefc 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 org.graalvm.compiler.asm.aarch64.AArch64Assembler;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
+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 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 1fee2f1a2fd8..c675e30840cb 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.code.DataSection;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.options.Option;
+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 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 f44aa4c290af..2d145136e443 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 ad7ff10a2bd6..41fb83e08638 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.StableMethodNameFormatter;
+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 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 8868fffac35c..2149de0ef35c 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 org.graalvm.compiler.core.common.CompressEncoding;
+import jdk.compiler.graal.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 dbab4b8b6dde..d95d5676173e 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+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 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 8fec58df18a4..ff6fcab9ca09 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
-import org.graalvm.compiler.core.common.type.TypedConstant;
+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 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 2203bcb91551..7a8ec094296b 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
+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 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 a1624185d64b..c5cb5704558b 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 661d2eeccb9e..16ccce6fa007 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 org.graalvm.compiler.core.common.NumUtil;
+import jdk.compiler.graal.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 7952d4a1649b..5344465e563e 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 924a7d5b67b3..cb0d7ce912f6 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.options.Option;
 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/image/sources/SourceManager.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceManager.java
index 6e5b030e0256..e076da6c804d 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 org.graalvm.compiler.debug.DebugContext;
+import jdk.compiler.graal.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 5aecf8c9e951..a5d223b74a3b 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 30046cf2acd1..15d562dc9a53 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Activation;
-import org.graalvm.compiler.debug.DebugContext.Scope;
-import org.graalvm.compiler.debug.Indent;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 981d63dc2c8c..8cb5c41a07ad 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 org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.options.OptionType;
+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 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 2f1dfeb40bf1..f1ab4fa4b6b5 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.options.Option;
+import jdk.compiler.graal.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 a246e5a1e0e2..34227daac84e 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 38e436bb6474..2a42994f9411 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.RawLoadNode;
-import org.graalvm.compiler.nodes.extended.RawStoreNode;
+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 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 dc5c0bd0772a..b7e3fa53024a 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 org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
+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 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 00bbb057952c..1f378c1b738c 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 org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.calc.ReinterpretNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.word.WordTypes;
+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 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 76e650e417dc..b5cc82965b03 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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.ObjectEqualsNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.word.WordTypes;
+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 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 73a1b9d320e1..11b261939cb2 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.MonitorEnterNode;
-import org.graalvm.compiler.nodes.java.MonitorExitNode;
-import org.graalvm.compiler.nodes.java.MonitorIdNode;
+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 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 ec43c16dadcc..f02ba916b71c 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 cd90699f788b..fa344d06472d 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.java.LambdaUtils;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
+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 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 9871356dec63..c6dc8fd2d224 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 org.graalvm.compiler.java.LambdaUtils;
+import jdk.compiler.graal.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 90bb88b54a74..52d1b7bd1b94 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 org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.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 90dc7d191207..33a078d2218b 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 org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.type.CompressibleConstant;
+import jdk.compiler.graal.core.common.CompressEncoding;
+import jdk.compiler.graal.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 305506a6877a..1d7cfce60c13 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 org.graalvm.compiler.core.common.type.TypedConstant;
+import jdk.compiler.graal.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 b4a9d122c56b..090c543bfc3c 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 org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.JavaMethodContext;
-import org.graalvm.compiler.java.StableMethodNameFormatter;
-import org.graalvm.compiler.nodes.StructuredGraph;
+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 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 04d91eb95c83..572190742a7d 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 org.graalvm.compiler.word.WordTypes;
+import jdk.compiler.graal.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 5387b862d2d9..43c5db3028b6 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 87f1bd74ad85..9ed18ebffd9c 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 org.graalvm.compiler.core.common.type.TypedConstant;
+import jdk.compiler.graal.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 b3fc97e3bccd..d6f19a0f7087 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 org.graalvm.compiler.core.common.spi.JavaConstantFieldProvider;
+import jdk.compiler.graal.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 65bb2fdd6a71..cc2134ec392f 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 org.graalvm.compiler.core.common.calc.UnsignedMath;
+import jdk.compiler.graal.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 9a553a9ff14d..af1edb7e9627 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 org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.Indent;
+import jdk.compiler.graal.core.common.NumUtil;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 6172426ff161..3d274202323d 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 3f802147a5e5..c69b64121f56 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 org.graalvm.compiler.graph.IterableNodeType;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ValueNumberable;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.nodeinfo.InputType;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.spi.Canonicalizable;
-import org.graalvm.compiler.nodes.spi.CanonicalizerTool;
-import org.graalvm.compiler.nodes.spi.LIRLowerable;
-import org.graalvm.compiler.nodes.spi.LimitedValueProxy;
-import org.graalvm.compiler.nodes.spi.NodeLIRBuilderTool;
+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 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 5cc971155198..9c111fffaa03 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 org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+import jdk.compiler.graal.options.OptionKey;
+import jdk.compiler.graal.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 e37c375c5ab3..c9f7fef9faa1 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 org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionDescriptors;
-import org.graalvm.compiler.options.OptionKey;
-import org.graalvm.compiler.options.OptionValues;
+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 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 2b7e0b43467e..b6ea47f4529c 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 org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.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 3949c2b6ed7b..641b5f50cf09 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 org.graalvm.compiler.options.OptionDescriptor;
-import org.graalvm.compiler.options.OptionGroup;
-import org.graalvm.compiler.options.OptionKey;
+import jdk.compiler.graal.options.OptionDescriptor;
+import jdk.compiler.graal.options.OptionGroup;
+import jdk.compiler.graal.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 3e96981ea34f..d50f0df77983 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 org.graalvm.compiler.core.common.BootstrapMethodIntrospection;
-import org.graalvm.compiler.java.BciBlockMapping;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.word.WordTypes;
+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 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.internal.vm.compiler", "org.graalvm.compiler.nodes");
+            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, accessingClass, false, "jdk.internal.vm.compiler", "jdk.compiler.graal.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 15176fdbc0f9..058bd058b91c 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
+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 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 de12e15e7bd4..30d673994c63 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.AddNode;
-import org.graalvm.compiler.nodes.calc.AndNode;
-import org.graalvm.compiler.nodes.calc.ConditionalNode;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.LeftShiftNode;
-import org.graalvm.compiler.nodes.calc.MulNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.OrNode;
-import org.graalvm.compiler.nodes.calc.RightShiftNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.JavaReadNode;
-import org.graalvm.compiler.nodes.extended.JavaWriteNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.memory.address.AddressNode;
-import org.graalvm.compiler.nodes.memory.address.OffsetAddressNode;
-import org.graalvm.compiler.word.WordTypes;
+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 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 b84bb928b12d..73adc4550206 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 org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.util.ConstantFoldUtil;
+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 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 4c1aa64c7329..7d86f34e2fb4 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 org.graalvm.compiler.bytecode.Bytecode;
-import org.graalvm.compiler.bytecode.BytecodeStream;
-import org.graalvm.compiler.core.common.PermanentBailoutException;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.java.BciBlockMapping;
-import org.graalvm.compiler.options.OptionValues;
+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 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 275e8d6219ef..6046e8e720f7 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 org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.phases.common.inlining.InliningUtil;
+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 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 de9c78dd4ad0..af05e670d840 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 org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.compiler.graal.nodes.ConstantNode;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.compiler.graal.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 3a2ea7494142..2539eda7b3ee 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 92a6874e79fb..1a258b3fb4b7 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 org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.word.WordTypes;
+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 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 d4f3ba569edb..d2cbd39e5e16 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ProfileData.BranchProbabilityData;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.WithExceptionNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 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 b9851bff2d3f..254c4f570bec 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.phases.Phase;
+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 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 fad3bbb9cbf0..05a9a5261390 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.BasePhase;
+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 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 e5f90099b80b..cc3484dc2377 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 org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+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 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 35411f8a6410..2f88d9254839 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
+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 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 877490c2e1d7..2501844a5b7e 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
@@ -24,18 +24,17 @@
  */
 package com.oracle.svm.hosted.phases;
 
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-
 import com.oracle.graal.pointsto.meta.AnalysisMetaAccess;
 import com.oracle.graal.pointsto.phases.InlineBeforeAnalysisPolicy;
 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.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 1ad826a3effe..b8d10d03f457 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractEndNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StartNode;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.extended.ValueAnchorNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.java.AbstractNewObjectNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.spi.ValueProxy;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.replacements.nodes.MethodHandleWithExceptionNode;
+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 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 bab8b30cf0fd..334b1c1ccdd9 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 org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.spi.MetaAccessExtensionProvider;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.PrimitiveStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeClass;
-import org.graalvm.compiler.graph.NodeMap;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodeinfo.NodeCycles;
-import org.graalvm.compiler.nodeinfo.NodeInfo;
-import org.graalvm.compiler.nodeinfo.NodeSize;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.ArithmeticOperation;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.InvokeNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ReturnNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.FloatingNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.AnchoringNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode.BytecodeExceptionKind;
-import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderTool;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.OptionalInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.nodes.java.FinalFieldBarrierNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.InlineDuringParsingPlugin;
-import org.graalvm.compiler.replacements.MethodHandlePlugin;
-import org.graalvm.compiler.word.WordOperationPlugin;
+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 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 29ad938f614f..14d6e9285970 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.core.common.calc.Condition;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugCloseable;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.BciBlockMapping;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.IfNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnreachableBeginNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GeneratedInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.word.WordTypes;
+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 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 756abb63fe8a..702bd8ce12d9 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 org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.ObjectStamp;
-import org.graalvm.compiler.core.common.type.Stamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicConstantNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.ParameterNode;
-import org.graalvm.compiler.nodes.PhiNode;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.spi.LimitedValueProxy;
-import org.graalvm.compiler.phases.Phase;
+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 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 820db8246183..6095d3504b65 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+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 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 c32756e8785a..18644a5ef3cf 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 org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo;
-import org.graalvm.compiler.nodes.graphbuilderconf.IntrinsicContext;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.word.WordTypes;
+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 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 e11e99e7ad8a..c2e73a9d963b 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 org.graalvm.compiler.core.common.cfg.BasicBlock;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.lir.LIR;
-import org.graalvm.compiler.lir.LIRFrameState;
-import org.graalvm.compiler.lir.LIRInstruction;
-import org.graalvm.compiler.lir.framemap.FrameMap;
-import org.graalvm.compiler.lir.gen.LIRGenerationResult;
-import org.graalvm.compiler.lir.phases.FinalCodeAnalysisPhase;
+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 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 71588e1726ab..1995fbd3456c 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 org.graalvm.compiler.nodes.FixedGuardNode;
-import org.graalvm.compiler.nodes.GuardNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.Phase;
+import jdk.compiler.graal.nodes.FixedGuardNode;
+import jdk.compiler.graal.nodes.GuardNode;
+import jdk.compiler.graal.nodes.StructuredGraph;
+import jdk.compiler.graal.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 8f929ab055d8..b886462eb25b 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 org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
-import org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.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 29b70c2aed72..7b0570c3a87a 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 4a02b422f9d9..b752247977a0 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 org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.StampPair;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.IndirectCallTargetNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 0dfe2886fa60..56e747beec17 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.compiler.graal.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 00508cedd69c..7bdd42ad389a 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 org.graalvm.compiler.core.common.calc.FloatConvert;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.core.common.type.TypeReference;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.AbstractMergeNode;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.EndNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.MergeNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.ValuePhiNode;
-import org.graalvm.compiler.nodes.calc.FloatConvertNode;
-import org.graalvm.compiler.nodes.calc.IntegerEqualsNode;
-import org.graalvm.compiler.nodes.calc.IsNullNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.GuardingNode;
-import org.graalvm.compiler.nodes.java.ArrayLengthNode;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.java.InstanceOfNode;
-import org.graalvm.compiler.nodes.type.StampTool;
+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 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 50ef8fc81045..ba1b7911168e 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.util.TypeConversion;
-import org.graalvm.compiler.core.common.util.UnsafeArrayTypeWriter;
+import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.core.common.util.TypeConversion;
+import jdk.compiler.graal.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 c665eeff3124..347744c590b1 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.java.LambdaUtils;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.printer.GraalDebugHandlersFactory;
-import org.graalvm.compiler.replacements.MethodHandlePlugin;
+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 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 d0a26e9c9126..e838ce127ea0 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.ClassInitializationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.options.Option;
+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 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 6cda332ac395..8e2620660805 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.CompressEncoding;
-import org.graalvm.compiler.core.common.type.AbstractObjectStamp;
-import org.graalvm.compiler.core.common.type.IntegerStamp;
-import org.graalvm.compiler.core.common.type.StampFactory;
-import org.graalvm.compiler.graph.Edges;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.NodeList;
-import org.graalvm.compiler.graph.NodeSourcePosition;
-import org.graalvm.compiler.java.BytecodeParser;
-import org.graalvm.compiler.java.LambdaUtils;
-import org.graalvm.compiler.nodes.AbstractBeginNode;
-import org.graalvm.compiler.nodes.BeginNode;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DynamicPiNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.FixedWithNextNode;
-import org.graalvm.compiler.nodes.FullInfopointNode;
-import org.graalvm.compiler.nodes.LogicNode;
-import org.graalvm.compiler.nodes.NodeView;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.NarrowNode;
-import org.graalvm.compiler.nodes.calc.ZeroExtendNode;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.nodes.extended.LoadHubNode;
-import org.graalvm.compiler.nodes.extended.StateSplitProxyNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.nodes.java.DynamicNewInstanceNode;
-import org.graalvm.compiler.nodes.java.InstanceOfDynamicNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
-import org.graalvm.compiler.nodes.java.StoreIndexedNode;
-import org.graalvm.compiler.nodes.spi.ArrayLengthProvider;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.nodes.type.NarrowOopStamp;
-import org.graalvm.compiler.nodes.type.StampTool;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.nodes.virtual.AllocatedObjectNode;
-import org.graalvm.compiler.nodes.virtual.CommitAllocationNode;
-import org.graalvm.compiler.nodes.virtual.VirtualArrayNode;
-import org.graalvm.compiler.nodes.virtual.VirtualObjectNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins;
-import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.AllocateUninitializedArrayPlugin;
-import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.CounterModeCryptPlugin;
-import org.graalvm.compiler.replacements.StandardGraphBuilderPlugins.ReachabilityFencePlugin;
-import org.graalvm.compiler.replacements.nodes.AESNode;
-import org.graalvm.compiler.replacements.nodes.CipherBlockChainingAESNode;
-import org.graalvm.compiler.replacements.nodes.CounterModeAESNode;
-import org.graalvm.compiler.replacements.nodes.MacroNode.MacroParams;
-import org.graalvm.compiler.word.WordCastNode;
+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 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 9e26484431da..6e6c0021f1f9 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 08864f1da534..6c5c7dbb7800 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
+import jdk.compiler.graal.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 831447b96bd4..bf8de5135085 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 org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.DeadEndNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+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 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 4b3b7ef49775..e9b961162d6d 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.java.FrameStateBuilder;
-import org.graalvm.compiler.nodes.CallTargetNode.InvokeKind;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.UnwindNode;
-import org.graalvm.compiler.nodes.ValueNode;
+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 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 36d6bf2ce3c3..87787be2e62d 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.CallTargetNode;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StateSplit;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.NewArrayNode;
+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 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 de9f63965222..5a44ad15a162 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.nodes.StructuredGraph;
+import jdk.compiler.graal.debug.DebugContext;
+import jdk.compiler.graal.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 06ae0eea81ca..8f69dffd5003 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 org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DebugContext.Builder;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.iterators.NodeIterable;
-import org.graalvm.compiler.java.GraphBuilderPhase;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.calc.SignExtendNode;
-import org.graalvm.compiler.nodes.calc.SubNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.java.LoadFieldNode;
-import org.graalvm.compiler.nodes.java.MethodCallTargetNode;
-import org.graalvm.compiler.nodes.java.StoreFieldNode;
-import org.graalvm.compiler.nodes.util.ConstantFoldUtil;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.OptimisticOptimizations;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 b160cb645706..6354e5206300 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 org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.graph.Node;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.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 2eff92be0dba..aff9a599cb41 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
+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 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 e4ceb69cb154..fbc40cec6ea3 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.phases.util.Providers;
+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 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 45c112a57204..e89189dc3ee7 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.common.NumUtil;
-import org.graalvm.compiler.core.common.memory.BarrierType;
-import org.graalvm.compiler.core.common.memory.MemoryOrderMode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.Receiver;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.phases.util.Providers;
+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 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/SVMJUnitRunner.java b/substratevm/src/com.oracle.svm.junit/src/com/oracle/svm/junit/SVMJUnitRunner.java
index 15eaebe6beb6..570aadb7db09 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 org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.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 acd77f731fe2..ad6389d1897a 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 org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
+import jdk.compiler.graal.nodes.ValueNode;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
+import jdk.compiler.graal.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 c3e2cd440ca4..3260ec07bee3 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 org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.phases.util.Providers;
+import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
+import jdk.compiler.graal.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.internal.vm.compiler", "org.graalvm.compiler.nodes");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, ScalaFeature.class, false, "jdk.internal.vm.compiler", "jdk.compiler.graal.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 dd1c5de49303..cbd2cb089e4a 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 org.graalvm.compiler.processor.AbstractProcessor;
+import jdk.compiler.graal.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 cce7abcdb186..f72aebc99fb5 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 org.graalvm.compiler.processor.AbstractProcessor;
+import jdk.compiler.graal.processor.AbstractProcessor;
 
 // Checkstyle: allow Class.getSimpleName
 
diff --git a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/AbstractJfrTest.java b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/AbstractJfrTest.java
index ffde76ad560e..c42f5f13ef4a 100644
--- a/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/AbstractJfrTest.java
+++ b/substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/AbstractJfrTest.java
@@ -49,7 +49,6 @@
 import com.oracle.svm.core.jfr.SubstrateJVM;
 import com.oracle.svm.core.util.TimeUtils;
 import com.oracle.svm.test.jfr.utils.JfrFileParser;
-import com.oracle.svm.util.ModuleSupport;
 
 import jdk.jfr.Configuration;
 import jdk.jfr.consumer.RecordedEvent;
@@ -188,12 +187,4 @@ protected interface EventValidator {
 }
 
 class JfrTestFeature implements Feature {
-    @Override
-    public void afterRegistration(AfterRegistrationAccess access) {
-        /*
-         * Use of org.graalvm.compiler.serviceprovider.JavaVersionUtil.JAVA_SPEC in
-         * com.oracle.svm.test.jfr.utils.poolparsers.ClassConstantPoolParser.parse
-         */
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, JfrTestFeature.class, false, "jdk.internal.vm.compiler", "org.graalvm.compiler.serviceprovider");
-    }
 }
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 9ca22b0fe7ff..a41c8a0937fd 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 42e5a27e8feb..0f2096f2e7f5 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 d7b12b1d5376..f4db713bd5a1 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 a5441ffee37d..2b6065fd7e28 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 org.graalvm.compiler.serviceprovider.JavaVersionUtil;
+import jdk.compiler.graal.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 d1aff9bd5cc8..cc4f5e3cea09 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 org.graalvm.compiler.word.Word;
+import jdk.compiler.graal.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 0c5b7039cfad..c8e46b4aaaf6 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.internal.vm.compiler/org.graalvm.compiler.debug=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/org.graalvm.compiler.graph=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/org.graalvm.compiler.nodes=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/org.graalvm.compiler.nodes.java=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/org.graalvm.compiler.options=ALL-UNNAMED \
+           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.debug=ALL-UNNAMED \
+           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.graph=ALL-UNNAMED \
+           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.nodes=ALL-UNNAMED \
+           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.nodes.java=ALL-UNNAMED \
+           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.options=ALL-UNNAMED \
            --add-exports org.graalvm.truffle.runtime/com.oracle.truffle.runtime=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/org.graalvm.util.json=ALL-UNNAMED \
+           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.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 71c51f9e5989..013069a12d07 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 org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.graph.NodeInputList;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.PiNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.java.NewInstanceNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionType;
+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 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 f47fb03e2cbc..568c9aee59c2 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 org.graalvm.util.json.JSONParserException;
+import jdk.compiler.graal.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 2bb0d83beff5..b71a22f31a2b 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 org.graalvm.compiler.core.common.spi.ConstantFieldProvider;
+import jdk.compiler.graal.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 e42678a1f6d5..2eb9e0d9a2c2 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
-import org.graalvm.compiler.truffle.compiler.host.HostInliningPhase;
+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.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.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 c4ba776fd3e7..84eae97178e0 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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.debug.GraalError;
+import jdk.compiler.graal.truffle.compiler.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 e5828e4441df..7648a45da8d3 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 org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.TruffleElementCache;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
+import jdk.compiler.graal.truffle.compiler.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 59f21ca0bf74..803999f02689 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 org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.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 7ea248595382..2cdd2dddd4e2 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 org.graalvm.compiler.options.OptionType.User;
+import static jdk.compiler.graal.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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInlineOnlyInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins.Registration;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionStability;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.host.InjectImmutableFrameFieldsPhase;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
-import org.graalvm.compiler.truffle.compiler.substitutions.TruffleInvocationPlugins;
+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.compiler.host.InjectImmutableFrameFieldsPhase;
+import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.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 = "org.graalvm.compiler.code.ObjdumpDisassemblerProvider", onlyWith = {
+@TargetClass(className = "jdk.compiler.graal.code.ObjdumpDisassemblerProvider", onlyWith = {
                 TruffleBaseFeature.IsEnabled.class, TruffleBaseFeature.IsCreateProcessDisabled.class})
-final class Target_org_graalvm_compiler_code_ObjdumpDisassemblerProvider {
+final class Target_jdk_compiler_graal_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 d1cc41f35744..a5e3af90a9d4 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 org.graalvm.compiler.java.BytecodeParserOptions.InlineDuringParsingMaxDepth;
-import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.DO_NOT_INLINE_WITH_EXCEPTION;
-import static org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin.InlineInfo.createStandardInlineInfo;
+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 java.lang.reflect.Executable;
 import java.lang.reflect.Field;
@@ -104,27 +104,27 @@
 import java.util.function.UnaryOperator;
 
 import org.graalvm.collections.Pair;
-import org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.core.phases.HighTier;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.nodes.FrameState;
-import org.graalvm.compiler.nodes.ValueNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.spi.Replacements;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.common.CanonicalizerPhase;
-import org.graalvm.compiler.phases.tiers.Suites;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.host.HostInliningPhase;
-import org.graalvm.compiler.truffle.compiler.host.TruffleHostEnvironment;
-import org.graalvm.compiler.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode;
+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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
+import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.compiler.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 de82c4ead8ca..e8156ffb6cce 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 org.graalvm.compiler.api.replacements.SnippetReflectionProvider;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.truffle.compiler.EconomyPartialEvaluatorConfiguration;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluatorConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.TruffleTierConfiguration;
+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.compiler.EconomyPartialEvaluatorConfiguration;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.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 941f8702b1cc..b07d647ee569 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 org.graalvm.compiler.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.compiler.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 9bf3bf161c67..984e5882a8a6 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.compiler.graal.truffle.compiler.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 be17f51c1935..fa938839ad5d 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 org.graalvm.compiler.bytecode.BytecodeProvider;
-import org.graalvm.compiler.graph.SourceLanguagePositionProvider;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.LoopExplosionPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.nodes.spi.CoreProviders;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
+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 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 88f80291f188..c9306b099e44 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 org.graalvm.compiler.graph.SourceLanguagePositionProvider;
-import org.graalvm.compiler.nodes.EncodedGraph;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderConfiguration.Plugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.InlineInvokePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
-import org.graalvm.compiler.nodes.graphbuilderconf.NodePlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.ParameterPlugin;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.PEGraphDecoder;
-import org.graalvm.compiler.replacements.PEGraphDecoder.SpecialCallTargetCacheKey;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluatorConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleTierContext;
+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.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.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 0fa18354b60a..de923908613d 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 org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.truffle.compiler.PostPartialEvaluationSuite;
+import jdk.compiler.graal.options.OptionValues;
+import jdk.compiler.graal.truffle.compiler.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 9b7626eccb8c..26e5373cd28b 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 org.graalvm.compiler.replacements.SnippetTemplate.DEFAULT_REPLACER;
+import static jdk.compiler.graal.replacements.SnippetTemplate.DEFAULT_REPLACER;
 
 import java.util.Arrays;
 import java.util.Map;
 
-import org.graalvm.compiler.api.replacements.Snippet;
-import org.graalvm.compiler.core.common.spi.ForeignCallDescriptor;
-import org.graalvm.compiler.graph.Node;
-import org.graalvm.compiler.graph.Node.ConstantNodeParameter;
-import org.graalvm.compiler.graph.Node.NodeIntrinsic;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.extended.BranchProbabilityNode;
-import org.graalvm.compiler.nodes.extended.ForeignCallNode;
-import org.graalvm.compiler.nodes.spi.LoweringTool;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.util.Providers;
-import org.graalvm.compiler.replacements.SnippetTemplate;
-import org.graalvm.compiler.replacements.SnippetTemplate.Arguments;
-import org.graalvm.compiler.replacements.SnippetTemplate.SnippetInfo;
-import org.graalvm.compiler.replacements.Snippets;
-import org.graalvm.compiler.truffle.compiler.nodes.TruffleSafepointNode;
+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.compiler.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 b765a9e3e827..01fde99646bf 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 org.graalvm.compiler.truffle.compiler.AbstractTruffleCompilationSupport;
+import jdk.compiler.graal.truffle.compiler.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 ecc281aabfd6..033b31b8d053 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 org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.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 c4b098b32e23..abc81a56300f 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 org.graalvm.compiler.code.CompilationResult;
-import org.graalvm.compiler.core.CompilationWrapper;
-import org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.target.Backend;
-import org.graalvm.compiler.debug.DebugContext;
-import org.graalvm.compiler.debug.DiagnosticsOutputDirectory;
-import org.graalvm.compiler.options.OptionValues;
-import org.graalvm.compiler.phases.PhaseSuite;
-import org.graalvm.compiler.phases.tiers.HighTierContext;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilationIdentifier;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerConfiguration;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerImpl;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions;
-import org.graalvm.compiler.truffle.compiler.TruffleTierConfiguration;
-import org.graalvm.compiler.truffle.compiler.phases.InstrumentationSuite;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleTier;
+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.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration;
+import jdk.compiler.graal.truffle.compiler.phases.InstrumentationSuite;
+import jdk.compiler.graal.truffle.compiler.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 c81e5da500f8..34e4b5560e48 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 org.graalvm.compiler.nodes.ConstantNode;
-import org.graalvm.compiler.nodes.graphbuilderconf.GraphBuilderContext;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugin.RequiredInvocationPlugin;
-import org.graalvm.compiler.nodes.graphbuilderconf.InvocationPlugins;
+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.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 018c3162a1c4..b41a9334f8e8 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 org.graalvm.compiler.api.replacements.Fold;
-import org.graalvm.compiler.options.Option;
+import jdk.compiler.graal.api.replacements.Fold;
+import jdk.compiler.graal.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 83fb3b6c75a6..638a6d855ba1 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 org.graalvm.compiler.nodes.DeoptimizeNode;
-import org.graalvm.compiler.nodes.FixedNode;
-import org.graalvm.compiler.nodes.Invoke;
-import org.graalvm.compiler.nodes.InvokeWithExceptionNode;
-import org.graalvm.compiler.nodes.StructuredGraph;
-import org.graalvm.compiler.nodes.java.ExceptionObjectNode;
-import org.graalvm.compiler.nodes.util.GraphUtil;
-import org.graalvm.compiler.phases.Phase;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
+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.compiler.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 e90b6a0904f3..94bd8f232cfc 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.core.common.SuppressFBWarnings;
-import org.graalvm.compiler.nodes.PauseNode;
-import org.graalvm.compiler.truffle.compiler.PartialEvaluator;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilation;
-import org.graalvm.compiler.truffle.compiler.phases.TruffleTier;
-import org.graalvm.compiler.word.Word;
+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.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
+import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.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 c11c27d5feaa..51a79fff6c4a 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 org.graalvm.compiler.debug.GraalError;
+import jdk.compiler.graal.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 b2619834fa50..0283d05d3868 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 org.graalvm.compiler.core.common.CompilationIdentifier;
-import org.graalvm.compiler.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.core.common.CompilationIdentifier;
+import jdk.compiler.graal.truffle.compiler.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 094ff3cad059..432b3db19eeb 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 org.graalvm.compiler.debug.GraalError;
-import org.graalvm.compiler.nodes.extended.BytecodeExceptionNode;
-import org.graalvm.compiler.options.Option;
-import org.graalvm.compiler.options.OptionKey;
+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 org.graalvm.nativeimage.ImageSingletons;
 
 public class ImageBuildStatistics {
diff --git a/truffle/docs/BranchInstrumentation.md b/truffle/docs/BranchInstrumentation.md
index eeba908af8a9..146458ffad79 100644
--- a/truffle/docs/BranchInstrumentation.md
+++ b/truffle/docs/BranchInstrumentation.md
@@ -105,7 +105,7 @@ com.oracle.truffle.sl.nodes.expression.SLLessThanNodeGen.executeBoolean_long_lon
 com.oracle.truffle.sl.nodes.expression.SLLessThanNodeGen.executeBoolean(SLLessThanNodeGen.java:33) [bci: 14]
 com.oracle.truffle.sl.nodes.controlflow.SLWhileRepeatingNode.evaluateCondition(SLWhileRepeatingNode.java:133) [bci: 5]
 com.oracle.truffle.sl.nodes.controlflow.SLWhileRepeatingNode.executeRepeating(SLWhileRepeatingNode.java:102) [bci: 2]
-org.graalvm.compiler.truffle.OptimizedOSRLoopNode.executeLoop(OptimizedOSRLoopNode.java:113) [bci: 61]
+com.oracle.truffle.runtime.OptimizedOSRLoopNode.executeLoop(OptimizedOSRLoopNode.java:113) [bci: 61]
 com.oracle.truffle.sl.nodes.controlflow.SLWhileNode.executeVoid(SLWhileNode.java:69) [bci: 5]
 com.oracle.truffle.sl.nodes.controlflow.SLBlockNode.executeVoid(SLBlockNode.java:84) [bci: 37]
 com.oracle.truffle.sl.nodes.controlflow.SLFunctionBodyNode.executeGeneric(SLFunctionBodyNode.java:81) [bci: 5]
diff --git a/truffle/docs/HostCompilation.md b/truffle/docs/HostCompilation.md
index 02bd63d0b0f5..ed553bd77bbd 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.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/host/HostInliningPhase.java).
+The source code for this phase can be found in [HostInliningPhase](../../compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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[org.graalvm.compiler.truffle.test.HostInliningBytecodeInterpreterExampleTest$BytecodeNode.execute]
-          INLINE org.graalvm.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 org.graalvm.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]
+      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]
           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 org.graalvm.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()]
+          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()]
           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 org.graalvm.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 org.graalvm.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 org.graalvm.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 org.graalvm.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 org.graalvm.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 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 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 17f21c17e21d..9af4007c65d1 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](https://github.com/oracle/graal/blob/master/wasm/src/org.graalvm.wasm/src/org/graalvm/wasm/parser/ir/CallNode.java) in the inline [call tree](https://github.com/oracle/graal/blob/master/compiler/src/jdk.internal.vm.compiler/src/org/graalvm/compiler/truffle/compiler/phases/inlining/CallTree.java)
+[Nodes](../../compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java) in the inline [call tree](../../compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/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 ffd232b9f174..d7a6b3c4bf66 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
-        org.graalvm.compiler.core.common.CancellationBailoutException: Compilation cancelled.: 16
-        org.graalvm.compiler.core.common.RetryableBailoutException: Assumption invalidated while compiling code: IsolatedObjectConstant[Object]: 1
+        jdk.compiler.graal.core.common.CancellationBailoutException: Compilation cancelled.: 16
+        jdk.compiler.graal.core.common.RetryableBailoutException: Assumption invalidated while compiling code: IsolatedObjectConstant[Object]: 1
       Permanent Bailouts        : 0
       Failed                    : 0
       Interrupted               : 3
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 f74432d89fcf..db533f4c0a20 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 org.graalvm.compiler.test.SubprocessUtil
+    // Methods and constants copied from jdk.compiler.graal.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.compiler/src/com/oracle/truffle/compiler/hotspot/libgraal/TruffleFromLibGraal.java b/truffle/src/com.oracle.truffle.compiler/src/com/oracle/truffle/compiler/hotspot/libgraal/TruffleFromLibGraal.java
index 449ab7070966..7ba31d8720e0 100644
--- a/truffle/src/com.oracle.truffle.compiler/src/com/oracle/truffle/compiler/hotspot/libgraal/TruffleFromLibGraal.java
+++ b/truffle/src/com.oracle.truffle.compiler/src/com/oracle/truffle/compiler/hotspot/libgraal/TruffleFromLibGraal.java
@@ -53,9 +53,8 @@
  * Annotates methods associated with both ends of a libgraal to HotSpot call. This annotation
  * simplifies navigating between these methods in an IDE.
  *
- * The
- * {@code org.graalvm.compiler.truffle.compiler.hotspot.libgraal.processor.TruffleFromLibGraalProcessor}
- * processor will produce a helper method for marshaling arguments and making the JNI call.
+ * The {@code com.oracle.truffle.libgraal.processor.TruffleFromLibGraalProcessor} processor will
+ * produce a helper method for marshaling arguments and making the JNI call.
  */
 @Repeatable(TruffleFromLibGraalRepeated.class)
 @Retention(RetentionPolicy.RUNTIME)
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 953e0c0b925e..c85afac37848 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 org.graalvm.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 org.graalvm.compiler.truffle.common.hotspot.libgraal.TruffleFromLibGraal.Id}. This helps
+ * Processor for the {@code jdk.compiler.graal.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
  * 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.
  */
@@ -81,8 +81,8 @@ public class TruffleFromLibGraalProcessor extends BaseProcessor {
 
     /**
      * Captures the info defined by a
-     * {@code org.graalvm.compiler.truffle.common.hotspot.libgraal.TruffleFromLibGraal.Id} enum
-     * constant. That is, a method name, return type and parameter types.
+     * {@code com.oracle.truffle.compiler.hotspot.libgraal.TruffleFromLibGraal.Id} enum constant.
+     * That is, a method name, return type and parameter types.
      */
     static class Id {
 
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 ea8794885bf6..790f16876e13 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,10 +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
- * org.graalvm.compiler.truffle.compiler.TruffleCompilerOptions
- * 
    
- * They replace the deprecated {@code -Dgraal.} Truffle-related options declared in
- * org.graalvm.compiler.truffle.common.processor.Option
+ * jdk.compiler.graal.truffle.TruffleCompilerOptions
  */
 @Option.Group("engine")
 public final class OptimizedRuntimeOptions {
@@ -77,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 org.graalvm.compiler.core.CompilationWrapper.ExceptionAction}.
+     * as defined in {@code jdk.compiler.graal.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/hotspot/HotSpotTruffleRuntimeAccess.java b/truffle/src/com.oracle.truffle.runtime/src/com/oracle/truffle/runtime/hotspot/HotSpotTruffleRuntimeAccess.java
index b15389ffc8fd..dede16792b1f 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
@@ -54,6 +54,8 @@
 import jdk.vm.ci.runtime.JVMCI;
 import jdk.vm.ci.services.Services;
 
+import java.util.Set;
+
 public final class HotSpotTruffleRuntimeAccess implements TruffleRuntimeAccess {
 
     public HotSpotTruffleRuntimeAccess() {
@@ -124,8 +126,9 @@ protected static TruffleRuntime createRuntime() {
                  * That the compiler has a qualified export to Truffle may not be enough if truffle
                  * is running in an isolated module layer.
                  */
-                Modules.addExports(compilerModule, "org.graalvm.compiler.truffle.compiler.hotspot", HotSpotTruffleRuntimeAccess.class.getModule());
-                Class hotspotCompilationSupport = Class.forName(compilerModule, "org.graalvm.compiler.truffle.compiler.hotspot.HotSpotTruffleCompilationSupport");
+                String pkg = getTruffleGraalHotSpotPackage(compilerModule);
+                Modules.addExports(compilerModule, pkg, HotSpotTruffleRuntimeAccess.class.getModule());
+                Class hotspotCompilationSupport = Class.forName(compilerModule, pkg + ".HotSpotTruffleCompilationSupport");
                 compilationSupport = (TruffleCompilationSupport) hotspotCompilationSupport.getConstructor().newInstance();
             } catch (ReflectiveOperationException e) {
                 throw new InternalError(e);
@@ -136,4 +139,21 @@ protected static TruffleRuntime createRuntime() {
         return rt;
     }
 
+    /**
+     * Handle history of renamings applied to Graal.
+     */
+    private static String getTruffleGraalHotSpotPackage(Module compilerModule) {
+        String[] history = {
+                        "jdk.compiler.graal.truffle.hotspot",
+                        "org.graalvm.compiler.truffle.compiler.hotspot"
+        };
+        Set packages = compilerModule.getPackages();
+        for (String name : history) {
+            if (packages.contains(name)) {
+                return name;
+            }
+        }
+        throw new InternalError(String.format("Cannot find package containing Truffle runtime in %s module (names searched: %s)",
+                        compilerModule.getName(), String.join(", ", history)));
+    }
 }
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 3733cedd2974..ccd368dc3ff7 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("org.graalvm.compiler.truffle.Compilation")
+@Name("jdk.compiler.graal.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 15e3b8902f25..02543c2dbb47 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("org.graalvm.compiler.truffle.CompilationFailure")
+@Name("jdk.compiler.graal.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 db688dd92d1a..600115dbcc7a 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("org.graalvm.compiler.truffle.CompilerStatistics")
+@Name("jdk.compiler.graal.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 9cafa9a20427..fa60b86dfb43 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("org.graalvm.compiler.truffle.Deoptimization")
+@Name("jdk.compiler.graal.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 bbe448fa9015..16ce34fadd02 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("org.graalvm.compiler.truffle.AssumptionInvalidation")
+@Name("jdk.compiler.graal.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 a38bd1058e2e..331d92755987 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 org.graalvm.compiler.serviceprovider.GraalServices}.
+ * A subset of the methods defined in {@code jdk.compiler.graal.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 4262cbab3f57..3ba32258a996 100644
--- a/vm/mx.vm/mx_vm_gate.py
+++ b/vm/mx.vm/mx_vm_gate.py
@@ -88,7 +88,7 @@ def _unittest_config_participant(config):
 
 def _get_CountUppercase_vmargs():
     cp = mx.project("jdk.internal.vm.compiler.test").classpath_repr()
-    return ['-cp', cp, 'org.graalvm.compiler.test.CountUppercase']
+    return ['-cp', cp, 'jdk.compiler.graal.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:
-            # org.graalvm.compiler.core.CompilationWatchDog.EventHandler.STUCK_COMPILATION_EXIT_CODE
+            # jdk.compiler.graal.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:
-            # org.graalvm.compiler.core.CompilationWatchDog.EventHandler.STUCK_COMPILATION_EXIT_CODE
+            # jdk.compiler.graal.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 c629346f6e89..c9f018870ad1 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("org.graalvm.compiler.hotspot.test.CompileTheWorld");
+                Class ctwClass = Class.forName("jdk.compiler.graal.hotspot.test.CompileTheWorld");
                 Method createMethod = ctwClass.getDeclaredMethod("create");
                 Method prepareMethod = ctwClass.getDeclaredMethod("prepare");
                 Object ctw = createMethod.invoke(null);

From 2c3f36944b4e367eeb0718a1263eb2386fbb4020 Mon Sep 17 00:00:00 2001
From: Doug Simon 
Date: Sun, 8 Oct 2023 00:09:43 +0200
Subject: [PATCH 3/6] consolidate isGraalClass checks

---
 .../hotspot/HotSpotReplacementsImpl.java      | 26 +++++++++++++++----
 .../graal/hotspot/SymbolicSnippetEncoder.java | 13 +++++-----
 2 files changed, 27 insertions(+), 12 deletions(-)

diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java
index 2247eabaf848..764cf35dd5e8 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java
@@ -292,7 +292,7 @@ public static MetaAccessProvider noticeTypes(MetaAccessProvider metaAccess) {
     }
 
     static boolean isGraalClass(ResolvedJavaType type) {
-        return isGraalClass(MetaUtil.internalNameToJava(type.getName(), true, true));
+        return isGraalClass(type.toClassName());
     }
 
     static boolean isGraalClass(Class clazz) {
@@ -300,10 +300,26 @@ static boolean isGraalClass(Class clazz) {
     }
 
     static boolean isGraalClass(String className) {
-        return className.contains("jdk.vm.ci") ||
-                        className.contains("org.graalvm.") ||
-                        className.contains("com.oracle.graal") ||
-                        className.contains("com.oracle.truffle");
+        String elementClassName;
+        if (className.charAt(0) == '[') {
+            elementClassName = className;
+            while (elementClassName.charAt(0) == '[') {
+                elementClassName = elementClassName.substring(1);
+            }
+            if (elementClassName.charAt(0) != 'L') {
+                // Primitive class
+                return false;
+            }
+
+            // Strip leading 'L' and trailing ';'
+            elementClassName = elementClassName.substring(1, elementClassName.length() - 1);
+        } else {
+            elementClassName = className;
+        }
+        return elementClassName.startsWith("jdk.vm.ci.") ||
+                        elementClassName.startsWith("jdk.compiler.graal.") ||
+                        elementClassName.startsWith("org.graalvm.") ||
+                        elementClassName.startsWith("com.oracle.graal.");
     }
 
     @Override
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java
index 2542caa31998..1e94130f477b 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java
+++ b/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java
@@ -468,7 +468,7 @@ synchronized void registerSnippet(ResolvedJavaMethod method, ResolvedJavaMethod
                         if (info.isVarargsParameter(i)) {
                             resolvedJavaType = resolvedJavaType.getElementalType();
                         }
-                        assert resolvedJavaType.isPrimitive() || HotSpotReplacementsImpl.isGraalClass(resolvedJavaType) : method +
+                        assert resolvedJavaType.isPrimitive() || isGraalClass(resolvedJavaType) : method +
                                         ": only Graal classes can be @ConstantParameter or @VarargsParameter: " + type;
                         ensureSnippetTypeAvailable(resolvedJavaType);
                     } else {
@@ -605,16 +605,14 @@ public JavaConstant readArrayElement(JavaConstant array, int index) {
         @Override
         public JavaConstant readFieldValue(ResolvedJavaField field, JavaConstant receiver) {
             JavaConstant javaConstant = constantReflection.readFieldValue(field, receiver);
-            String fieldClass = field.getDeclaringClass().getName();
+            ResolvedJavaType declaringClass = field.getDeclaringClass();
+            String fieldClass = declaringClass.getName();
             if (fieldClass.contains("java/util/EnumMap") || field.getType().getName().contains("java/util/EnumMap")) {
                 throw new GraalError("Snippets should not use EnumMaps in generated code");
             }
 
             if (!safeConstants.contains(receiver) &&
-                            !fieldClass.contains("graalvm") &&
-                            !fieldClass.contains("com/oracle/graal") &&
-                            !fieldClass.contains("jdk/vm/ci/") &&
-                            !fieldClass.contains("jdk/internal/vm/compiler") &&
+                            !isGraalClass(declaringClass) &&
                             !field.getName().equals("TYPE")) {
                 // Only permit constant reflection on compiler classes. This is necessary primarily
                 // because of the boxing snippets which are compiled as snippets but are really just
@@ -831,7 +829,8 @@ private Object filterStamp(DebugContext debug, Stamp stamp) {
                     throw new InternalError(stamp.toString());
                 }
                 ResolvedJavaType elementalType = type.getElementalType();
-                if (elementalType.getName().startsWith("Ljdk/vm/ci") || elementalType.getName().startsWith("Lorg/graalvm/") || elementalType.getName().startsWith("Lcom/oracle/graal/")) {
+                String elementalTypeName = elementalType.getName();
+                if (isGraalClass(elementalType)) {
                     if (!type.equals(elementalType)) {
                         // Ensure that the underlying type is available
                         ensureSnippetTypeAvailable(elementalType);

From ce7e8225b0f8d46104ea02dd42f041d23bcd5a9b Mon Sep 17 00:00:00 2001
From: Doug Simon 
Date: Wed, 11 Oct 2023 23:52:34 +0200
Subject: [PATCH 4/6] module rename: jdk.internal.vm.compiler to
 jdk.compiler.graal

---
 ci_includes/publish-javadoc.jsonnet           |   4 +-
 compiler/docs/Debugging.md                    |  10 +-
 compiler/mx.compiler/mx_compiler.py           |  12 +-
 compiler/mx.compiler/mx_graal_benchmark.py    |   2 +-
 .../mx.compiler/mx_renamegraalpackages.py     |  93 ----
 .../mx.compiler/mx_updategraalinopenjdk.py    | 486 ------------------
 compiler/mx.compiler/suite.py                 |  76 +--
 .../jdk21/test/PreviewEnabledTest.java        |   0
 .../jdk21/test/ScopedValueCacheTest.java      |   0
 .../graal/management/JMXServiceProvider.java  |   0
 .../ConditionalEliminationBenchmark.java      |   0
 .../FrameStateAssigmentPhaseBenchmark.java    |   0
 .../microbenchmarks/graal/GraalBenchmark.java |   2 +-
 .../graal/GraphCopyBenchmark.java             |   0
 .../microbenchmarks/graal/NodeBenchmark.java  |   0
 .../graal/SchedulePhaseBenchmark.java         |   0
 .../graal/TestJMHWhitebox.java                |   0
 .../graal/util/FrameStateAssignmentState.java |   0
 .../graal/util/GraalState.java                |   0
 .../microbenchmarks/graal/util/GraalUtil.java |   0
 .../graal/util/GraphState.java                |   0
 .../graal/util/MethodSpec.java                |   0
 .../graal/util/NodesState.java                |   0
 .../graal/util/ScheduleState.java             |   0
 .../lir/CompileTimeBenchmark.java             |   0
 .../lir/GraalCompilerState.java               |   0
 .../lir/RegisterAllocationTimeBenchmark.java  |   0
 .../javax.annotation.processing.Processor     |   0
 .../core/match/processor/MatchProcessor.java  |   0
 .../lir/processor/IntrinsicStubProcessor.java |   0
 .../lir/processor/SyncPortProcessor.java      |   0
 .../nodeinfo/processor/ElementException.java  |   0
 .../processor/GraphNodeProcessor.java         |   0
 .../nodeinfo/processor/GraphNodeVerifier.java |   0
 .../options/processor/OptionProcessor.java    |   0
 .../graal/processor/AbstractProcessor.java    |   0
 .../graal/processor/SuppressFBWarnings.java   |   0
 .../processor/APHotSpotSignature.java         |   0
 .../processor/AnnotationHandler.java          |   0
 .../replacements/processor/FoldHandler.java   |   0
 .../processor/GeneratedFoldPlugin.java        |   0
 .../GeneratedNodeIntrinsicPlugin.java         |   0
 .../processor/GeneratedPlugin.java            |   0
 .../processor/InjectedDependencies.java       |   0
 .../processor/NodeIntrinsicHandler.java       |   0
 .../processor/PluginGenerator.java            |   0
 .../ReplacementsAnnotationProcessor.java      |   0
 .../processor/ServiceProviderProcessor.java   |   0
 .../test/BlackholeDirectiveTest.java          |   0
 .../ConstantProbablityBranchFoldingTest.java  |   0
 .../test/ControlFlowAnchorDirectiveTest.java  |   0
 .../test/DeoptimizeDirectiveTest.java         |   0
 .../GraalDirectiveIntrinsificationTest.java   |   0
 .../test/IterationDirectiveTest.java          |   0
 .../directives/test/OpaqueDirectiveTest.java  |   0
 .../ProbabilityDirectiveShortCircuitTest.java |   0
 .../test/ProbabilityDirectiveTest.java        |   0
 .../SwitchCaseProbabilityDirectiveTest.java   |   0
 .../graal/api/test/ExportingClassLoader.java  |   0
 .../jdk/compiler/graal/api/test/Graal.java    |   0
 .../compiler/graal/api/test/GraalAPITest.java |   0
 .../graal/api/test/ModuleSupport.java         |   0
 .../test/AArch64AddressingModeTest.java       |   0
 .../test/AArch64BitCountAssemblerTest.java    |   0
 .../test/AArch64InstructionEncodingTest.java  |   0
 .../AArch64LoadStoreMergingAssemblerTest.java |   0
 .../aarch64/test/AArch64MoveConstantTest.java |   0
 .../aarch64/test/TestProtectedAssembler.java  |   0
 .../amd64/test/AMD64AssemblerUtilityTest.java |   0
 .../graal/asm/amd64/test/BitOpsTest.java      |   0
 .../test/IncrementDecrementMacroTest.java     |   0
 .../asm/amd64/test/IndirectCallTest.java      |   0
 .../asm/amd64/test/SimpleAssemblerTest.java   |   0
 .../graal/asm/test/AssemblerTest.java         |   0
 .../aarch64/test/AArch64AddSubShiftTest.java  |   0
 .../aarch64/test/AArch64ArrayAddressTest.java |   0
 .../aarch64/test/AArch64BitFieldTest.java     |   0
 .../test/AArch64BitwiseLogicalNotTest.java    |   0
 .../core/aarch64/test/AArch64CbzTest.java     |   0
 .../test/AArch64ConditionalSetTest.java       |   0
 .../aarch64/test/AArch64ElideL2ITest.java     |   0
 .../aarch64/test/AArch64FloatSqrtTest.java    |   0
 .../aarch64/test/AArch64LogicShiftTest.java   |   0
 .../core/aarch64/test/AArch64MNegTest.java    |   0
 .../aarch64/test/AArch64MatchRuleTest.java    |   0
 .../aarch64/test/AArch64MembarOpTest.java     |   0
 .../AArch64MergeExtendWithAddSubTest.java     |   0
 .../AArch64MergeNarrowWithAddSubTest.java     |   0
 .../AArch64MergeNarrowWithExtendTest.java     |   0
 .../test/AArch64MultiplyAddSubTest.java       |   0
 .../aarch64/test/AArch64MultiplyLongTest.java |   0
 .../aarch64/test/AArch64NegateShiftTest.java  |   0
 .../test/AArch64PairLoadStoreTest.java        |   0
 .../aarch64/test/AArch64RotationTest.java     |   0
 .../test/AArch64TestBitAndBranchTest.java     |   0
 .../test/AArch64VolatileAccessesTest.java     |   0
 .../amd64/test/AMD64AddressLoweringTest.java  |   0
 .../core/amd64/test/AMD64AllocatorTest.java   |   0
 .../core/amd64/test/AMD64MatchRuleTest.java   |   0
 ...D64VolatileWriteMembarEliminationTest.java |   0
 .../amd64/test/ConstantStackMoveTest.java     |   0
 .../graal/core/amd64/test/StackStoreTest.java |   0
 .../core/test/AbsCanonicalizationTest.java    |   0
 .../compiler/graal/core/test/AllocSpy.java    |   0
 .../test/ArrayCopyVirtualizationTest.java     |   0
 .../core/test/ArrayLengthProviderTest.java    |   0
 .../core/test/BasePhaseBinaryGraphTest.java   |   0
 .../graal/core/test/BciBlockMappingTest.java  |   0
 .../core/test/BoxingEliminationTest.java      |   0
 .../compiler/graal/core/test/BoxingTest.java  |   0
 .../graal/core/test/ByteBufferTest.java       |   0
 .../core/test/BytecodeDisassemblerTest.java   |   0
 .../test/CanonicalizedConversionTest.java     |   0
 .../graal/core/test/CheckGraalInvariants.java |   2 +-
 .../core/test/CommonedConstantsTest.java      |   0
 .../core/test/CompareCanonicalizerTest.java   |   0
 .../core/test/CompareCanonicalizerTest2.java  |   0
 .../core/test/CompareCanonicalizerTest3.java  |   0
 .../core/test/CompilationResultTest.java      |   0
 .../core/test/CompilationWatchDogTest.java    |   0
 .../graal/core/test/ConcreteSubtypeTest.java  |   0
 .../graal/core/test/ConditionTest.java        |   0
 .../test/ConditionalEliminationMulTest.java   |   0
 .../test/ConditionalEliminationPiTest.java    |   0
 .../ConditionalEliminationRegressionTest.java |   0
 ...ditionalEliminationStampInversionTest.java |   0
 .../test/ConditionalEliminationTest1.java     |   0
 .../test/ConditionalEliminationTest10.java    |   0
 .../test/ConditionalEliminationTest11.java    |   0
 .../test/ConditionalEliminationTest12.java    |   0
 .../test/ConditionalEliminationTest13.java    |   0
 .../test/ConditionalEliminationTest14.java    |   0
 .../test/ConditionalEliminationTest15.java    |   0
 .../test/ConditionalEliminationTest16.java    |   0
 .../test/ConditionalEliminationTest2.java     |   0
 .../test/ConditionalEliminationTest3.java     |   0
 .../test/ConditionalEliminationTest4.java     |   0
 .../test/ConditionalEliminationTest5.java     |   0
 .../test/ConditionalEliminationTest6.java     |   0
 .../test/ConditionalEliminationTest7.java     |   0
 .../test/ConditionalEliminationTest8.java     |   0
 .../test/ConditionalEliminationTest9.java     |   0
 .../test/ConditionalEliminationTestBase.java  |   0
 .../graal/core/test/ConditionalNodeTest.java  |   0
 .../test/ConstantArrayReadFoldingTest.java    |   0
 .../core/test/CopyOfVirtualizationTest.java   |   0
 .../test/CountedLoopMaxTripCountPiTest.java   |   0
 .../core/test/CountedLoopOverflowTest.java    |   0
 .../graal/core/test/CountedLoopTest.java      |   0
 .../graal/core/test/CountedLoopTest2.java     |   0
 .../test/CustomizedBytecodePatternTest.java   |   0
 .../test/DeMorganCanonicalizationTest.java    |   0
 .../graal/core/test/DeepUnrollingTest.java    |   0
 .../graal/core/test/DegeneratedLoopsTest.java |   0
 .../graal/core/test/DirectByteBufferTest.java |   0
 .../core/test/DontReuseArgumentSpaceTest.java |   0
 .../graal/core/test/DumpPathTest.java         |   0
 .../graal/core/test/DynamicConstantTest.java  |   0
 .../graal/core/test/EarlyGVNTest.java         |   0
 .../graal/core/test/EnumSwitchTest.java       |   0
 .../graal/core/test/EnumValuesTest.java       |   0
 .../core/test/FinalizableSubclassTest.java    |   0
 .../test/FindUniqueConcreteMethodBugTest.java |   0
 .../test/FindUniqueDefaultMethodTest.java     |   0
 .../core/test/FloatOptimizationTest.java      |   0
 .../graal/core/test/FloatingDivTest.java      |   0
 .../graal/core/test/FloatingReadTest.java     |   0
 .../graal/core/test/FuzzTest36456.java        |   0
 .../graal/core/test/FuzzTest36457.java        |   0
 .../test/GraalCompilerAssumptionsTest.java    |   0
 .../graal/core/test/GraalCompilerTest.java    |   0
 .../test/GraalDebugHandlersFactoryTest.java   |   2 +-
 .../graal/core/test/GraphDumpingTest.java     |   0
 .../graal/core/test/GraphEncoderTest.java     |   0
 .../graal/core/test/GraphPrinterTest.java     |   0
 .../graal/core/test/GraphResetDebugTest.java  |   0
 .../graal/core/test/GraphScheduleTest.java    |   0
 .../test/GraphUtilOriginalValueTests.java     |   0
 .../graal/core/test/GuardPrioritiesTest.java  |   0
 .../graal/core/test/HashCodeTest.java         |   0
 .../core/test/IfCanonicalizerSwapTest.java    |   0
 .../graal/core/test/IfCanonicalizerTest.java  |   0
 .../graal/core/test/IfReorderTest.java        |   0
 .../core/test/ImplicitNullCheckTest.java      |   0
 .../graal/core/test/InfopointReasonTest.java  |   0
 .../test/InstalledCodeInvalidationTest.java   |   0
 .../graal/core/test/IntegerBoxEqualsTest.java |   0
 .../core/test/IntegerDivPowerOf2Test.java     |   0
 .../IntegerDivRemCanonicalizationTest.java    |   0
 .../core/test/IntegerDivRemConstantTest.java  |   0
 .../test/IntegerEqualsCanonicalizerTest.java  |   0
 ...erThanCommonArithmeticCorrectnessTest.java |   0
 ...rThanCommonArithmeticOptimizationTest.java |   0
 ...egerLowerThanCommonArithmeticTestBase.java |   0
 .../core/test/IntegerStampMulFoldTest.java    |   0
 .../core/test/IntegerStampShiftTest.java      |   0
 .../core/test/InterfaceMethodHandleTest.java  |   0
 .../core/test/InvocationPluginsTest.java      |   0
 .../graal/core/test/InvokeExceptionTest.java  |   0
 .../graal/core/test/InvokeHintsTest.java      |   0
 .../compiler/graal/core/test/IsArrayTest.java |   0
 .../graal/core/test/LockEliminationTest.java  |   0
 .../graal/core/test/LongNodeChainTest.java    |   0
 .../graal/core/test/LoopFullUnrollTest.java   |   0
 .../graal/core/test/LoopUnswitchTest.java     |   0
 .../graal/core/test/MarkUnsafeAccessTest.java |   0
 .../core/test/MaskingOptimizationTest.java    |   0
 .../graal/core/test/MatchRuleTest.java        |   0
 .../core/test/MathCopySignStampTest.java      |   0
 .../graal/core/test/MathSignumStampTest.java  |   0
 .../graal/core/test/MemoryArithmeticTest.java |   0
 .../test/MemoryGraphCanonicalizeTest.java     |   0
 .../graal/core/test/MemoryScheduleTest.java   |   0
 .../core/test/MergeCanonicalizerTest.java     |   0
 .../test/MethodHandleEagerResolution.java     |   0
 .../graal/core/test/MonitorGraphTest.java     |   0
 .../graal/core/test/MoveGuardsLoopTest.java   |   0
 .../graal/core/test/MulNegateTest.java        |   0
 .../graal/core/test/NarrowingReadTest.java    |   0
 .../core/test/NegateCanonicalizationTest.java |   0
 .../graal/core/test/NestedArithmeticTest.java |   0
 .../graal/core/test/NestedLoopTest.java       |   0
 .../graal/core/test/NewInstanceTest.java      |   0
 .../core/test/NodeCopyWithInputsTest.java     |   0
 .../graal/core/test/NodeMapGraphTest.java     |   0
 .../graal/core/test/NodePosIteratorTest.java  |   0
 .../graal/core/test/NodePropertiesTest.java   |   0
 .../core/test/ObjectSubstitutionsTest.java    |   0
 .../core/test/OffHeapUnsafeAccessTest.java    |   0
 .../core/test/OnStackReplacementTest.java     |   0
 .../graal/core/test/OptimizeExtendsTest.java  |   0
 .../graal/core/test/OptimizedBoxNodeTest.java |   0
 .../graal/core/test/OptionsVerifierTest.java  |   0
 .../graal/core/test/PhiCreationTests.java     |   0
 .../graal/core/test/ProfilingInfoTest.java    |   0
 .../core/test/PushNodesThroughPiTest.java     |   0
 .../graal/core/test/PushThroughIfTest.java    |   0
 .../core/test/ReadAfterCheckCastTest.java     |   0
 .../core/test/ReadConstantFoldingTest.java    |   0
 .../ReadConstantFoldingTestGenerator.java     |   0
 .../test/ReassociateAndCanonicalTest.java     |   0
 .../graal/core/test/ReassociationTest.java    |   0
 .../core/test/ReentrantBlockIteratorTest.java |   0
 .../graal/core/test/ReferenceGetLoopTest.java |   0
 .../test/ReflectionOptionDescriptors.java     |   0
 .../core/test/ResolveDynamicConstantTest.java |   0
 .../ReverseBytesIntoArrayRegressionTest.java  |   0
 .../graal/core/test/ScalarTypeSystemTest.java |   0
 .../graal/core/test/SchedulingTest.java       |   0
 .../graal/core/test/SchedulingTest2.java      |   0
 .../graal/core/test/ShortCircuitNodeTest.java |   0
 .../graal/core/test/SimpleCFGTest.java        |   0
 .../test/SingleImplementorInterfaceTest.java  |   0
 .../core/test/SingleRunSubphaseTest.java      |   0
 .../graal/core/test/SpectreFenceTest.java     |   0
 .../test/SpeculativeGuardMovementTest.java    |   0
 ...culativeGuardMovementTrivialDeoptTest.java |   0
 .../core/test/StableArrayReadFoldingTest.java |   0
 .../core/test/StampCanonicalizerTest.java     |   0
 .../core/test/StampMemoryAccessTest.java      |   0
 .../core/test/StaticInterfaceFieldTest.java   |   0
 .../graal/core/test/StraighteningTest.java    |   0
 .../core/test/SubWordArrayStoreTest.java      |   0
 .../core/test/SubWordFieldStoreTest.java      |   0
 .../graal/core/test/SubWordInputTest.java     |   0
 .../graal/core/test/SubWordInputTest2.java    |   0
 .../graal/core/test/SubWordReturnTest.java    |   0
 .../graal/core/test/SubWordTestUtil.java      |   0
 .../graal/core/test/SubprocessTest.java       |   0
 .../core/test/SwitchCanonicalizerTest.java    |   0
 .../graal/core/test/SwitchDyingLoopTest.java  |   0
 .../graal/core/test/SwitchFoldingTest.java    |   0
 .../compiler/graal/core/test/SwitchTest.java  |   0
 .../graal/core/test/TestAutoboxConf.java      |   0
 .../graal/core/test/TestBasePhase.java        |   0
 .../compiler/graal/core/test/TestPhase.java   |   0
 .../test/TrivialInliningExplosionTest.java    |   0
 .../core/test/TwoSlotMarkerClearingTest.java  |   0
 .../graal/core/test/TypeSystemTest.java       |   0
 .../graal/core/test/TypeWriterTest.java       |   0
 .../core/test/UnbalancedLockingTest.java      |   0
 .../core/test/UnbalancedMonitorsTest.java     |   0
 .../test/UncheckedInterfaceProviderTest.java  |   0
 .../graal/core/test/UnsafeCopyMemoryTest.java |   0
 .../test/UnsafeGetStableArrayElement.java     |   0
 .../core/test/UnsafeReadEliminationTest.java  |   0
 .../core/test/UnsafeVirtualizationTest.java   |   0
 .../core/test/UnschedulableGraphTest.java     |   0
 .../graal/core/test/UnsignedLongTest.java     |   0
 .../compiler/graal/core/test/UnusedArray.java |   0
 .../core/test/VerifyArchUsageInPlugins.java   |   0
 .../graal/core/test/VerifyBailoutUsage.java   |   0
 .../core/test/VerifyBailoutUsageTest.java     |   0
 .../graal/core/test/VerifyDebugUsage.java     |   0
 .../graal/core/test/VerifyDebugUsageTest.java |   0
 .../graal/core/test/VerifyEndlessLoops.java   |   0
 .../core/test/VerifyFoldableMethods.java      |   0
 .../core/test/VerifyGetOptionsUsage.java      |   0
 .../core/test/VerifyGraphUniqueUsages.java    |   0
 .../core/test/VerifyInstanceOfUsage.java      |   0
 .../core/test/VerifyIterableNodeType.java     |   0
 .../core/test/VerifyMemoryKillCheck.java      |   0
 .../core/test/VerifyPluginFrameState.java     |   0
 .../core/test/VerifyProfileMethodUsage.java   |   0
 .../test/VerifySharedConstantEmptyArray.java  |   0
 .../core/test/VerifySnippetProbabilities.java |   0
 .../core/test/VerifyStatelessPhases.java      |   0
 .../core/test/VerifyStringFormatterUsage.java |   0
 .../core/test/VerifySystemPropertyUsage.java  |   0
 .../graal/core/test/VerifyUnsafeAccess.java   |   0
 .../graal/core/test/VerifyUpdateUsages.java   |   0
 .../core/test/VerifyUsageWithEquals.java      |   0
 .../graal/core/test/VerifyVariableCasts.java  |   0
 .../core/test/VerifyVirtualizableTest.java    |   0
 .../core/test/VerifyVirtualizableUsage.java   |   0
 .../VolatileAccessReadEliminationTest.java    |   0
 ...tileReadEliminateWrongMemoryStateTest.java |   0
 .../graal/core/test/ZeroSignExtendTest.java   |   0
 .../core/test/backend/AllocatorTest.java      |   0
 .../graal/core/test/backend/BackendTest.java  |   0
 .../core/test/deopt/CompiledMethodTest.java   |   0
 .../core/test/deopt/MonitorDeoptTest.java     |   0
 .../deopt/RethrowDeoptMaterializeTest.java    |   0
 .../test/deopt/RethrowExceptionLoopTest.java  |   0
 .../test/deopt/SafepointRethrowDeoptTest.java |   0
 .../SynchronizedMethodDeoptimizationTest.java |   0
 .../test/ea/AtomicVirtualizationTests.java    |   0
 .../test/ea/CountUppercaseParallelTest.java   |   0
 .../graal/core/test/ea/EAMergingTest.java     |   0
 .../graal/core/test/ea/EATestBase.java        |   0
 .../core/test/ea/EscapeAnalysisTest.java      |   0
 .../graal/core/test/ea/ExpandLogicTest.java   |   0
 .../graal/core/test/ea/NestedBoxingTest.java  |   0
 .../graal/core/test/ea/PEAAssertionsTest.java |   0
 .../core/test/ea/PEAReadEliminationTest.java  |   0
 .../PartialEscapeAnalysisIterationTest.java   |   0
 .../test/ea/PartialEscapeAnalysisTest.java    |   0
 .../ea/PartialEscapeAnalysisTreesTest.java    |   0
 .../ea/PartialEscapeOptimizationLogTest.java  |   0
 .../test/ea/PartialEscapeUnsafeStoreTest.java |   0
 .../ea/PartialEscapeWithExceptionTest.java    |   0
 .../graal/core/test/ea/PoorMansEATest.java    |   0
 .../core/test/ea/ReadEliminationTest.java     |   0
 .../graal/core/test/ea/TrufflePEATest.java    |   0
 ...nsafeCompareAndSwapVirtualizationTest.java |   0
 .../graal/core/test/ea/UnsafeEATest.java      |   0
 .../core/test/inlining/InliningTest.java      |   0
 .../NestedLoopEffectsPhaseComplexityTest.java |   0
 ...NestedLoopEffectsPhaseComplexityTest2.java |   0
 .../core/test/jfr/TestGetEventWriter.java     |   0
 .../core/test/tutorial/GraalTutorial.java     |   0
 .../graal/core/test/tutorial/InvokeGraal.java |   0
 .../core/test/tutorial/StaticAnalysis.java    |   0
 .../test/tutorial/StaticAnalysisTests.java    |   0
 .../graal/debug/test/CSVUtilTest.java         |   0
 .../debug/test/CompilationAlarmTest.java      |   0
 .../graal/debug/test/DebugContextTest.java    |   0
 .../test/DebugContextTest.testLogging.input   |   0
 .../graal/debug/test/GraalErrorTest.java      |   0
 .../graal/debug/test/LogStreamTest.java       |   0
 .../compiler/graal/debug/test/TTYTest.java    |   0
 .../graal/debug/test/TimerKeyTest.java        |   0
 .../graal/debug/test/VersionsTest.java        |   0
 .../compiler/graal/graph/test/GraphTest.java  |   0
 .../graal/graph/test/NodeBitMapTest.java      |   0
 .../graal/graph/test/NodeFormatToTest.java    |   0
 .../graal/graph/test/NodeInputListTest.java   |   0
 .../graal/graph/test/NodeMapTest.java         |   0
 .../graal/graph/test/NodeUnionFindTest.java   |   0
 .../graph/test/NodeUsageIterableTest.java     |   0
 .../graal/graph/test/NodeUsagesTests.java     |   0
 .../graph/test/NodeValidationChecksTest.java  |   0
 .../graal/graph/test/TestNodeInterface.java   |   0
 .../graph/test/TypedNodeIteratorTest.java     |   0
 .../graph/test/TypedNodeIteratorTest2.java    |   0
 .../graph/test/graphio/GraphOutputTest.java   |   0
 .../graph/test/graphio/GraphSnippetTest.java  |   0
 .../graph/test/graphio/NodeEncodingTest.java  |   0
 .../test/matchers/NodeIterableContains.java   |   0
 .../test/matchers/NodeIterableCount.java      |   0
 .../test/matchers/NodeIterableIsEmpty.java    |   0
 .../test/AArch64UncompressPointerTest.java    |   0
 .../test/AMD64HotSpotFrameOmissionTest.java   |   0
 .../test/AMD64ReadAfterWriteMatchTest.java    |   0
 .../test/ArrayAccessInLoopToAddressTest.java  |   0
 .../amd64/test/BinaryMathStubTest.java        |   0
 .../graal/hotspot/amd64/test/BmiAndn.java     |   0
 .../graal/hotspot/amd64/test/BmiBlsi.java     |   0
 .../graal/hotspot/amd64/test/BmiBlsmsk.java   |   0
 .../graal/hotspot/amd64/test/BmiBlsr.java     |   0
 .../hotspot/amd64/test/BmiCompilerTest.java   |   0
 .../amd64/test/CompressedNullCheckTest.java   |   0
 .../amd64/test/DataPatchInConstantsTest.java  |   0
 .../amd64/test/MathPower0Point5Test.java      |   0
 .../test/NumberOfTrailingZeroings003.java     |   0
 ...ReachabilityFenceCanonicalizationTest.java |   0
 .../graal/hotspot/amd64/test/StubAVXTest.java |   0
 .../hotspot/amd64/test/UnaryMathStubTest.java |   0
 .../test/BenchmarkCounterOverflowTest.java    |   0
 .../lir/test/ExceedMaxOopMapStackOffset.java  |   0
 ...gateExceedingMaxOopMapStackOffsetTest.java |   0
 .../test/Adler32SubstitutionsTest.java        |   0
 .../test/ArrayCopyIntrinsificationTest.java   |   0
 .../hotspot/test/ArrayNewInstanceTest.java    |   0
 .../hotspot/test/Base64SubstitutionsTest.java |   0
 .../test/BigIntegerIntrinsicsTest.java        |   0
 .../hotspot/test/BoxDeoptimizationTest.java   |   0
 .../hotspot/test/CRC32CSubstitutionsTest.java |   0
 .../hotspot/test/CRC32SubstitutionsTest.java  |   0
 .../hotspot/test/CheckGraalIntrinsics.java    |   0
 .../hotspot/test/CheckIndexLongTest.java      |   0
 .../hotspot/test/ClassReplacementsTest.java   |   0
 .../hotspot/test/ClassSubstitutionsTests.java |   0
 .../hotspot/test/CompilationWrapperTest.java  |   0
 .../graal/hotspot/test/CompileTheWorld.java   |   4 +-
 .../hotspot/test/CompileTheWorldTest.java     |   0
 .../graal/hotspot/test/CompressedOopTest.java |   0
 .../graal/hotspot/test/DataPatchTest.java     |   0
 .../test/DeferredBarrierAdditionTest.java     |   0
 .../test/DeoptimizeReasonAccountingTest.java  |   0
 .../hotspot/test/ExplicitExceptionTest.java   |   0
 .../test/ForeignCallDeoptimizeTest.java       |   0
 .../graal/hotspot/test/GCStressTest.java      |   0
 .../test/GraalHotSpotVMConfigAccessTest.java  |   0
 .../graal/hotspot/test/GraalOSRLockTest.java  |   0
 .../graal/hotspot/test/GraalOSRTest.java      |   0
 .../graal/hotspot/test/GraalOSRTestBase.java  |   0
 .../hotspot/test/GraalOnlyIntrinsicsTest.java |   0
 .../graal/hotspot/test/HotSpotBase64Test.java |   0
 .../test/HotSpotClassInitializationTest.java  |   0
 .../test/HotSpotCryptoSubstitutionTest.java   |   0
 .../test/HotSpotDeoptExplicitExceptions.java  |   0
 .../test/HotSpotDeoptPostExceptions.java      |   0
 .../graal/hotspot/test/HotSpotGHASHTest.java  |   0
 .../test/HotSpotGraalCompilerTest.java        |   0
 .../test/HotSpotGraalOptionValuesTest.java    |   0
 .../test/HotSpotInvokeJavaMethodTest.java     |   0
 ...tSpotManagedFailedSpeculationListTest.java |   0
 .../test/HotSpotMethodSubstitutionTest.java   |   0
 .../hotspot/test/HotSpotMonitorValueTest.java |   0
 .../hotspot/test/HotSpotNmethodTest.java      |   0
 .../test/HotSpotNodeSubstitutionsTest.java    |   0
 .../hotspot/test/HotSpotObjectSizeTest.java   |   0
 .../test/HotSpotResolvedObjectTypeTest.java   |   0
 .../test/HotSpotStackIntrospectionTest.java   |   0
 .../test/HotSpotStampMemoryAccessTest.java    |   0
 .../graal/hotspot/test/HotSpotStubsTest.java  |   0
 .../test/HotSpotUnsafeSubstitutionTest.java   |   0
 .../graal/hotspot/test/HsErrLogTest.java      |   2 +-
 .../test/InstalledCodeExecuteHelperTest.java  |   0
 .../hotspot/test/JVMCIInfopointErrorTest.java |   0
 .../test/JVMCIVersionCheckMaxValueTest.java   |   0
 .../hotspot/test/JVMCIVersionCheckTest.java   |   0
 .../hotspot/test/LambdaStableNameTest.java    |   0
 .../hotspot/test/LibGraalCompilerTest.java    |   0
 .../graal/hotspot/test/LogNodeTest.java       |   0
 .../graal/hotspot/test/MathDoubleFMATest.java |   0
 .../test/MathFMAConstantInputTest.java        |   0
 .../graal/hotspot/test/MathFloatFMATest.java  |   0
 .../hotspot/test/MemoryUsageBenchmark.java    |   0
 .../graal/hotspot/test/ObjectCloneTest.java   |   0
 .../test/ObjectHashCodeInliningTest.java      |   0
 .../graal/hotspot/test/OptionsInFileTest.java |   0
 .../hotspot/test/PolymorphicInliningTest.java |   0
 .../graal/hotspot/test/ProfileReplayTest.java |   0
 .../test/RangeCheckPredicatesTest.java        |   0
 .../graal/hotspot/test/ReferenceTest.java     |   0
 .../hotspot/test/ReservedStackAccessTest.java |   0
 .../test/StringInternConstantTest.java        |   0
 .../test/StringUTF16ToBytesGetCharsTest.java  |   0
 .../hotspot/test/TestIntrinsicCompiles.java   |   0
 .../hotspot/test/UnsafeNewArrayTest.java      |   0
 .../test/UnsafeWritebackMemoryTest.java       |   0
 .../test/VirtualThreadCarrierThreadTest.java  |   0
 .../hotspot/test/VirtualThreadJFRTest.java    |   0
 .../test/WriteBarrierAdditionTest.java        |   0
 .../src/jdk/compiler/graal/jtt/JTTTest.java   |   0
 .../graal/jtt/backend/ConstantPhiTest.java    |   0
 .../graal/jtt/backend/EmptyMethodTest.java    |   0
 .../jtt/backend/LargeConstantSectionTest.java |   0
 .../graal/jtt/bytecode/BC_aaload.java         |   0
 .../graal/jtt/bytecode/BC_aaload_1.java       |   0
 .../graal/jtt/bytecode/BC_aastore.java        |   0
 .../graal/jtt/bytecode/BC_aload_0.java        |   0
 .../graal/jtt/bytecode/BC_aload_1.java        |   0
 .../graal/jtt/bytecode/BC_aload_2.java        |   0
 .../graal/jtt/bytecode/BC_aload_3.java        |   0
 .../graal/jtt/bytecode/BC_anewarray.java      |   0
 .../graal/jtt/bytecode/BC_areturn.java        |   0
 .../graal/jtt/bytecode/BC_arraylength.java    |   0
 .../graal/jtt/bytecode/BC_athrow.java         |   0
 .../graal/jtt/bytecode/BC_baload.java         |   0
 .../graal/jtt/bytecode/BC_bastore.java        |   0
 .../graal/jtt/bytecode/BC_caload.java         |   0
 .../graal/jtt/bytecode/BC_castore.java        |   0
 .../graal/jtt/bytecode/BC_checkcast01.java    |   0
 .../graal/jtt/bytecode/BC_checkcast02.java    |   0
 .../graal/jtt/bytecode/BC_checkcast03.java    |   0
 .../compiler/graal/jtt/bytecode/BC_d2f.java   |   0
 .../compiler/graal/jtt/bytecode/BC_d2i01.java |   0
 .../compiler/graal/jtt/bytecode/BC_d2i02.java |   0
 .../compiler/graal/jtt/bytecode/BC_d2l01.java |   0
 .../compiler/graal/jtt/bytecode/BC_d2l02.java |   0
 .../compiler/graal/jtt/bytecode/BC_d2l03.java |   0
 .../compiler/graal/jtt/bytecode/BC_dadd.java  |   0
 .../graal/jtt/bytecode/BC_daload.java         |   0
 .../graal/jtt/bytecode/BC_dastore.java        |   0
 .../graal/jtt/bytecode/BC_dcmp01.java         |   0
 .../graal/jtt/bytecode/BC_dcmp02.java         |   0
 .../graal/jtt/bytecode/BC_dcmp03.java         |   0
 .../graal/jtt/bytecode/BC_dcmp04.java         |   0
 .../graal/jtt/bytecode/BC_dcmp05.java         |   0
 .../graal/jtt/bytecode/BC_dcmp06.java         |   0
 .../graal/jtt/bytecode/BC_dcmp07.java         |   0
 .../graal/jtt/bytecode/BC_dcmp08.java         |   0
 .../graal/jtt/bytecode/BC_dcmp09.java         |   0
 .../graal/jtt/bytecode/BC_dcmp10.java         |   0
 .../compiler/graal/jtt/bytecode/BC_ddiv.java  |   0
 .../compiler/graal/jtt/bytecode/BC_dmul.java  |   0
 .../compiler/graal/jtt/bytecode/BC_dneg.java  |   0
 .../compiler/graal/jtt/bytecode/BC_dneg2.java |   0
 .../graal/jtt/bytecode/BC_double_base.java    |   0
 .../compiler/graal/jtt/bytecode/BC_drem.java  |   0
 .../graal/jtt/bytecode/BC_dreturn.java        |   0
 .../compiler/graal/jtt/bytecode/BC_dsub.java  |   0
 .../compiler/graal/jtt/bytecode/BC_dsub2.java |   0
 .../compiler/graal/jtt/bytecode/BC_f2d.java   |   0
 .../compiler/graal/jtt/bytecode/BC_f2i01.java |   0
 .../compiler/graal/jtt/bytecode/BC_f2i02.java |   0
 .../compiler/graal/jtt/bytecode/BC_f2l01.java |   0
 .../compiler/graal/jtt/bytecode/BC_f2l02.java |   0
 .../compiler/graal/jtt/bytecode/BC_fadd.java  |   0
 .../graal/jtt/bytecode/BC_faload.java         |   0
 .../graal/jtt/bytecode/BC_fastore.java        |   0
 .../graal/jtt/bytecode/BC_fcmp01.java         |   0
 .../graal/jtt/bytecode/BC_fcmp02.java         |   0
 .../graal/jtt/bytecode/BC_fcmp03.java         |   0
 .../graal/jtt/bytecode/BC_fcmp04.java         |   0
 .../graal/jtt/bytecode/BC_fcmp05.java         |   0
 .../graal/jtt/bytecode/BC_fcmp06.java         |   0
 .../graal/jtt/bytecode/BC_fcmp07.java         |   0
 .../graal/jtt/bytecode/BC_fcmp08.java         |   0
 .../graal/jtt/bytecode/BC_fcmp09.java         |   0
 .../graal/jtt/bytecode/BC_fcmp10.java         |   0
 .../compiler/graal/jtt/bytecode/BC_fdiv.java  |   0
 .../compiler/graal/jtt/bytecode/BC_fload.java |   0
 .../graal/jtt/bytecode/BC_fload_2.java        |   0
 .../graal/jtt/bytecode/BC_float_base.java     |   0
 .../compiler/graal/jtt/bytecode/BC_fmul.java  |   0
 .../compiler/graal/jtt/bytecode/BC_fneg.java  |   0
 .../compiler/graal/jtt/bytecode/BC_frem.java  |   0
 .../graal/jtt/bytecode/BC_freturn.java        |   0
 .../compiler/graal/jtt/bytecode/BC_fsub.java  |   0
 .../graal/jtt/bytecode/BC_getfield.java       |   0
 .../graal/jtt/bytecode/BC_getfield_b.java     |   0
 .../graal/jtt/bytecode/BC_getfield_c.java     |   0
 .../graal/jtt/bytecode/BC_getfield_d.java     |   0
 .../graal/jtt/bytecode/BC_getfield_f.java     |   0
 .../graal/jtt/bytecode/BC_getfield_i.java     |   0
 .../graal/jtt/bytecode/BC_getfield_l.java     |   0
 .../graal/jtt/bytecode/BC_getfield_o.java     |   0
 .../graal/jtt/bytecode/BC_getfield_s.java     |   0
 .../graal/jtt/bytecode/BC_getfield_z.java     |   0
 .../graal/jtt/bytecode/BC_getstatic_b.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_c.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_d.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_f.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_i.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_l.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_s.java    |   0
 .../graal/jtt/bytecode/BC_getstatic_z.java    |   0
 .../compiler/graal/jtt/bytecode/BC_i2b.java   |   0
 .../compiler/graal/jtt/bytecode/BC_i2c.java   |   0
 .../compiler/graal/jtt/bytecode/BC_i2d.java   |   0
 .../compiler/graal/jtt/bytecode/BC_i2f.java   |   0
 .../compiler/graal/jtt/bytecode/BC_i2l.java   |   0
 .../compiler/graal/jtt/bytecode/BC_i2s.java   |   0
 .../compiler/graal/jtt/bytecode/BC_iadd.java  |   0
 .../compiler/graal/jtt/bytecode/BC_iadd2.java |   0
 .../compiler/graal/jtt/bytecode/BC_iadd3.java |   0
 .../graal/jtt/bytecode/BC_iadd_const0.java    |   0
 .../graal/jtt/bytecode/BC_iadd_const1.java    |   0
 .../graal/jtt/bytecode/BC_iadd_const2.java    |   0
 .../graal/jtt/bytecode/BC_iadd_const3.java    |   0
 .../graal/jtt/bytecode/BC_iaload.java         |   0
 .../compiler/graal/jtt/bytecode/BC_iand.java  |   0
 .../graal/jtt/bytecode/BC_iastore.java        |   0
 .../graal/jtt/bytecode/BC_iconst.java         |   0
 .../compiler/graal/jtt/bytecode/BC_idiv.java  |   0
 .../compiler/graal/jtt/bytecode/BC_idiv2.java |   0
 .../graal/jtt/bytecode/BC_idiv_overflow.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ifeq.java  |   0
 .../graal/jtt/bytecode/BC_ifeq_2.java         |   0
 .../graal/jtt/bytecode/BC_ifeq_3.java         |   0
 .../compiler/graal/jtt/bytecode/BC_ifge.java  |   0
 .../graal/jtt/bytecode/BC_ifge_2.java         |   0
 .../graal/jtt/bytecode/BC_ifge_3.java         |   0
 .../compiler/graal/jtt/bytecode/BC_ifgt.java  |   0
 .../graal/jtt/bytecode/BC_ificmplt1.java      |   0
 .../graal/jtt/bytecode/BC_ificmplt2.java      |   0
 .../graal/jtt/bytecode/BC_ificmpne1.java      |   0
 .../graal/jtt/bytecode/BC_ificmpne2.java      |   0
 .../compiler/graal/jtt/bytecode/BC_ifle.java  |   0
 .../compiler/graal/jtt/bytecode/BC_iflt.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ifne.java  |   0
 .../graal/jtt/bytecode/BC_ifnonnull.java      |   0
 .../graal/jtt/bytecode/BC_ifnonnull_2.java    |   0
 .../graal/jtt/bytecode/BC_ifnonnull_3.java    |   0
 .../graal/jtt/bytecode/BC_ifnull.java         |   0
 .../graal/jtt/bytecode/BC_ifnull_2.java       |   0
 .../graal/jtt/bytecode/BC_ifnull_3.java       |   0
 .../graal/jtt/bytecode/BC_iinc_1.java         |   0
 .../graal/jtt/bytecode/BC_iinc_2.java         |   0
 .../graal/jtt/bytecode/BC_iinc_3.java         |   0
 .../graal/jtt/bytecode/BC_iinc_4.java         |   0
 .../graal/jtt/bytecode/BC_iload_0.java        |   0
 .../graal/jtt/bytecode/BC_iload_0_1.java      |   0
 .../graal/jtt/bytecode/BC_iload_0_2.java      |   0
 .../graal/jtt/bytecode/BC_iload_1.java        |   0
 .../graal/jtt/bytecode/BC_iload_1_1.java      |   0
 .../graal/jtt/bytecode/BC_iload_2.java        |   0
 .../graal/jtt/bytecode/BC_iload_3.java        |   0
 .../compiler/graal/jtt/bytecode/BC_imul.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ineg.java  |   0
 .../graal/jtt/bytecode/BC_instanceof.java     |   0
 .../graal/jtt/bytecode/BC_instanceof01.java   |   0
 .../jtt/bytecode/BC_invokeinterface.java      |   0
 .../graal/jtt/bytecode/BC_invokespecial.java  |   0
 .../graal/jtt/bytecode/BC_invokespecial2.java |   0
 .../graal/jtt/bytecode/BC_invokestatic.java   |   0
 .../graal/jtt/bytecode/BC_invokevirtual.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ior.java   |   0
 .../compiler/graal/jtt/bytecode/BC_irem.java  |   0
 .../compiler/graal/jtt/bytecode/BC_irem2.java |   0
 .../compiler/graal/jtt/bytecode/BC_irem3.java |   0
 .../compiler/graal/jtt/bytecode/BC_irem4.java |   0
 .../graal/jtt/bytecode/BC_ireturn.java        |   0
 .../compiler/graal/jtt/bytecode/BC_ishl.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ishr.java  |   0
 .../compiler/graal/jtt/bytecode/BC_isub.java  |   0
 .../compiler/graal/jtt/bytecode/BC_iushr.java |   0
 .../compiler/graal/jtt/bytecode/BC_ixor.java  |   0
 .../compiler/graal/jtt/bytecode/BC_l2d.java   |   0
 .../compiler/graal/jtt/bytecode/BC_l2f.java   |   0
 .../compiler/graal/jtt/bytecode/BC_l2i.java   |   0
 .../compiler/graal/jtt/bytecode/BC_l2i_2.java |   0
 .../compiler/graal/jtt/bytecode/BC_ladd.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ladd2.java |   0
 .../graal/jtt/bytecode/BC_laload.java         |   0
 .../compiler/graal/jtt/bytecode/BC_land.java  |   0
 .../graal/jtt/bytecode/BC_lastore.java        |   0
 .../compiler/graal/jtt/bytecode/BC_lcmp.java  |   0
 .../graal/jtt/bytecode/BC_ldc_01.java         |   0
 .../graal/jtt/bytecode/BC_ldc_02.java         |   0
 .../graal/jtt/bytecode/BC_ldc_03.java         |   0
 .../graal/jtt/bytecode/BC_ldc_04.java         |   0
 .../graal/jtt/bytecode/BC_ldc_05.java         |   0
 .../graal/jtt/bytecode/BC_ldc_06.java         |   0
 .../compiler/graal/jtt/bytecode/BC_ldiv.java  |   0
 .../compiler/graal/jtt/bytecode/BC_ldiv2.java |   0
 .../compiler/graal/jtt/bytecode/BC_ldiv3.java |   0
 .../graal/jtt/bytecode/BC_ldiv_overflow.java  |   0
 .../graal/jtt/bytecode/BC_lload_0.java        |   0
 .../graal/jtt/bytecode/BC_lload_01.java       |   0
 .../graal/jtt/bytecode/BC_lload_1.java        |   0
 .../graal/jtt/bytecode/BC_lload_2.java        |   0
 .../graal/jtt/bytecode/BC_lload_3.java        |   0
 .../compiler/graal/jtt/bytecode/BC_lmul.java  |   0
 .../compiler/graal/jtt/bytecode/BC_lneg.java  |   0
 .../graal/jtt/bytecode/BC_lookupswitch01.java |   0
 .../graal/jtt/bytecode/BC_lookupswitch02.java |   0
 .../graal/jtt/bytecode/BC_lookupswitch03.java |   0
 .../graal/jtt/bytecode/BC_lookupswitch04.java |   0
 .../graal/jtt/bytecode/BC_lookupswitch05.java |   0
 .../compiler/graal/jtt/bytecode/BC_lor.java   |   0
 .../compiler/graal/jtt/bytecode/BC_lrem.java  |   0
 .../compiler/graal/jtt/bytecode/BC_lrem2.java |   0
 .../graal/jtt/bytecode/BC_lreturn.java        |   0
 .../compiler/graal/jtt/bytecode/BC_lshl.java  |   0
 .../compiler/graal/jtt/bytecode/BC_lshr.java  |   0
 .../graal/jtt/bytecode/BC_lshr02.java         |   0
 .../compiler/graal/jtt/bytecode/BC_lsub.java  |   0
 .../compiler/graal/jtt/bytecode/BC_lushr.java |   0
 .../compiler/graal/jtt/bytecode/BC_lxor.java  |   0
 .../graal/jtt/bytecode/BC_monitorenter.java   |   0
 .../graal/jtt/bytecode/BC_monitorenter02.java |   0
 .../jtt/bytecode/BC_multianewarray01.java     |   0
 .../jtt/bytecode/BC_multianewarray02.java     |   0
 .../jtt/bytecode/BC_multianewarray03.java     |   0
 .../jtt/bytecode/BC_multianewarray04.java     |   0
 .../compiler/graal/jtt/bytecode/BC_new.java   |   0
 .../graal/jtt/bytecode/BC_newarray.java       |   0
 .../graal/jtt/bytecode/BC_newarray_02.java    |   0
 .../graal/jtt/bytecode/BC_putfield_01.java    |   0
 .../graal/jtt/bytecode/BC_putfield_02.java    |   0
 .../graal/jtt/bytecode/BC_putfield_03.java    |   0
 .../graal/jtt/bytecode/BC_putfield_04.java    |   0
 .../graal/jtt/bytecode/BC_putstatic.java      |   0
 .../graal/jtt/bytecode/BC_saload.java         |   0
 .../graal/jtt/bytecode/BC_sastore.java        |   0
 .../graal/jtt/bytecode/BC_tableswitch.java    |   0
 .../graal/jtt/bytecode/BC_tableswitch2.java   |   0
 .../graal/jtt/bytecode/BC_tableswitch3.java   |   0
 .../graal/jtt/bytecode/BC_tableswitch4.java   |   0
 .../graal/jtt/bytecode/BC_wide01.java         |   0
 .../graal/jtt/bytecode/BC_wide02.java         |   0
 .../compiler/graal/jtt/except/BC_aaload0.java |   0
 .../compiler/graal/jtt/except/BC_aaload1.java |   0
 .../graal/jtt/except/BC_aastore0.java         |   0
 .../graal/jtt/except/BC_aastore1.java         |   0
 .../graal/jtt/except/BC_anewarray.java        |   0
 .../graal/jtt/except/BC_arraylength.java      |   0
 .../compiler/graal/jtt/except/BC_athrow0.java |   0
 .../compiler/graal/jtt/except/BC_athrow1.java |   0
 .../compiler/graal/jtt/except/BC_athrow2.java |   0
 .../compiler/graal/jtt/except/BC_athrow3.java |   0
 .../compiler/graal/jtt/except/BC_baload.java  |   0
 .../compiler/graal/jtt/except/BC_bastore.java |   0
 .../compiler/graal/jtt/except/BC_caload.java  |   0
 .../compiler/graal/jtt/except/BC_castore.java |   0
 .../graal/jtt/except/BC_checkcast.java        |   0
 .../graal/jtt/except/BC_checkcast1.java       |   0
 .../graal/jtt/except/BC_checkcast2.java       |   0
 .../graal/jtt/except/BC_checkcast3.java       |   0
 .../graal/jtt/except/BC_checkcast4.java       |   0
 .../graal/jtt/except/BC_checkcast5.java       |   0
 .../graal/jtt/except/BC_checkcast6.java       |   0
 .../compiler/graal/jtt/except/BC_daload.java  |   0
 .../compiler/graal/jtt/except/BC_dastore.java |   0
 .../compiler/graal/jtt/except/BC_faload.java  |   0
 .../compiler/graal/jtt/except/BC_fastore.java |   0
 .../graal/jtt/except/BC_getfield.java         |   0
 .../graal/jtt/except/BC_getfield1.java        |   0
 .../compiler/graal/jtt/except/BC_iaload.java  |   0
 .../compiler/graal/jtt/except/BC_iastore.java |   0
 .../compiler/graal/jtt/except/BC_idiv.java    |   0
 .../compiler/graal/jtt/except/BC_idiv2.java   |   0
 .../graal/jtt/except/BC_invokespecial01.java  |   0
 .../graal/jtt/except/BC_invokevirtual01.java  |   0
 .../graal/jtt/except/BC_invokevirtual02.java  |   0
 .../compiler/graal/jtt/except/BC_irem.java    |   0
 .../compiler/graal/jtt/except/BC_laload.java  |   0
 .../compiler/graal/jtt/except/BC_lastore.java |   0
 .../compiler/graal/jtt/except/BC_ldiv.java    |   0
 .../compiler/graal/jtt/except/BC_ldiv2.java   |   0
 .../compiler/graal/jtt/except/BC_lrem.java    |   0
 .../graal/jtt/except/BC_monitorenter.java     |   0
 .../graal/jtt/except/BC_multianewarray.java   |   0
 .../graal/jtt/except/BC_newarray.java         |   0
 .../graal/jtt/except/BC_putfield.java         |   0
 .../compiler/graal/jtt/except/BC_saload.java  |   0
 .../compiler/graal/jtt/except/BC_sastore.java |   0
 .../graal/jtt/except/Catch_Loop01.java        |   0
 .../graal/jtt/except/Catch_Loop02.java        |   0
 .../graal/jtt/except/Catch_Loop03.java        |   0
 .../graal/jtt/except/Catch_NASE_1.java        |   0
 .../graal/jtt/except/Catch_NASE_2.java        |   0
 .../graal/jtt/except/Catch_NPE_00.java        |   0
 .../graal/jtt/except/Catch_NPE_01.java        |   0
 .../graal/jtt/except/Catch_NPE_02.java        |   0
 .../graal/jtt/except/Catch_NPE_03.java        |   0
 .../graal/jtt/except/Catch_NPE_04.java        |   0
 .../graal/jtt/except/Catch_NPE_05.java        |   0
 .../graal/jtt/except/Catch_NPE_06.java        |   0
 .../graal/jtt/except/Catch_NPE_07.java        |   0
 .../graal/jtt/except/Catch_NPE_08.java        |   0
 .../graal/jtt/except/Catch_NPE_09.java        |   0
 .../graal/jtt/except/Catch_NPE_10.java        |   0
 .../graal/jtt/except/Catch_NPE_11.java        |   0
 .../except/Catch_StackOverflowError_01.java   |   0
 .../except/Catch_StackOverflowError_02.java   |   0
 .../except/Catch_StackOverflowError_03.java   |   0
 .../graal/jtt/except/Catch_Two01.java         |   0
 .../graal/jtt/except/Catch_Two02.java         |   0
 .../graal/jtt/except/Catch_Two03.java         |   0
 .../graal/jtt/except/Catch_Unresolved.java    |   0
 .../graal/jtt/except/Catch_Unresolved01.java  |   0
 .../graal/jtt/except/Catch_Unresolved02.java  |   0
 .../graal/jtt/except/Catch_Unresolved03.java  |   0
 .../graal/jtt/except/Except_Locals.java       |   0
 .../jtt/except/Except_Synchronized01.java     |   0
 .../jtt/except/Except_Synchronized02.java     |   0
 .../jtt/except/Except_Synchronized03.java     |   0
 .../jtt/except/Except_Synchronized04.java     |   0
 .../jtt/except/Except_Synchronized05.java     |   0
 .../compiler/graal/jtt/except/Finally01.java  |   0
 .../compiler/graal/jtt/except/Finally02.java  |   0
 .../jtt/except/StackTrace_AIOOBE_00.java      |   0
 .../graal/jtt/except/StackTrace_CCE_00.java   |   0
 .../graal/jtt/except/StackTrace_NPE_00.java   |   0
 .../graal/jtt/except/StackTrace_NPE_01.java   |   0
 .../graal/jtt/except/StackTrace_NPE_02.java   |   0
 .../graal/jtt/except/StackTrace_NPE_03.java   |   0
 .../graal/jtt/except/Throw_InCatch01.java     |   0
 .../graal/jtt/except/Throw_InCatch02.java     |   0
 .../graal/jtt/except/Throw_InCatch03.java     |   0
 .../graal/jtt/except/Throw_InNested.java      |   0
 .../graal/jtt/except/Throw_NPE_01.java        |   0
 .../jtt/except/Throw_Synchronized01.java      |   0
 .../jtt/except/Throw_Synchronized02.java      |   0
 .../jtt/except/Throw_Synchronized03.java      |   0
 .../jtt/except/Throw_Synchronized04.java      |   0
 .../jtt/except/Throw_Synchronized05.java      |   0
 .../graal/jtt/except/UntrustedInterfaces.java |   0
 .../graal/jtt/hotpath/HP_allocate01.java      |   0
 .../graal/jtt/hotpath/HP_allocate02.java      |   0
 .../graal/jtt/hotpath/HP_allocate03.java      |   0
 .../graal/jtt/hotpath/HP_allocate04.java      |   0
 .../graal/jtt/hotpath/HP_array01.java         |   0
 .../graal/jtt/hotpath/HP_array02.java         |   0
 .../graal/jtt/hotpath/HP_array03.java         |   0
 .../graal/jtt/hotpath/HP_array04.java         |   0
 .../graal/jtt/hotpath/HP_control01.java       |   0
 .../graal/jtt/hotpath/HP_control02.java       |   0
 .../graal/jtt/hotpath/HP_convert01.java       |   0
 .../compiler/graal/jtt/hotpath/HP_count.java  |   0
 .../compiler/graal/jtt/hotpath/HP_dead01.java |   0
 .../compiler/graal/jtt/hotpath/HP_demo01.java |   0
 .../graal/jtt/hotpath/HP_field01.java         |   0
 .../graal/jtt/hotpath/HP_field02.java         |   0
 .../graal/jtt/hotpath/HP_field03.java         |   0
 .../graal/jtt/hotpath/HP_field04.java         |   0
 .../compiler/graal/jtt/hotpath/HP_idea.java   |   0
 .../graal/jtt/hotpath/HP_inline01.java        |   0
 .../graal/jtt/hotpath/HP_inline02.java        |   0
 .../graal/jtt/hotpath/HP_invoke01.java        |   0
 .../compiler/graal/jtt/hotpath/HP_life.java   |   0
 .../compiler/graal/jtt/hotpath/HP_nest01.java |   0
 .../compiler/graal/jtt/hotpath/HP_nest02.java |   0
 .../graal/jtt/hotpath/HP_scope01.java         |   0
 .../graal/jtt/hotpath/HP_scope02.java         |   0
 .../compiler/graal/jtt/hotpath/HP_series.java |   0
 .../graal/jtt/hotpath/HP_trees01.java         |   0
 .../graal/jtt/hotspot/Test6186134.java        |   0
 .../graal/jtt/hotspot/Test6196102.java        |   0
 .../graal/jtt/hotspot/Test6753639.java        |   0
 .../graal/jtt/hotspot/Test6823354.java        |   0
 .../graal/jtt/hotspot/Test6850611.java        |   0
 .../graal/jtt/hotspot/Test6959129.java        |   0
 .../graal/jtt/hotspot/Test7005594.java        |   0
 .../compiler/graal/jtt/jdk/CharacterBits.java |   0
 .../compiler/graal/jtt/jdk/Class_getName.java |   0
 .../graal/jtt/jdk/DivideUnsigned.java         |   0
 .../jdk/compiler/graal/jtt/jdk/EnumMap01.java |   0
 .../jdk/compiler/graal/jtt/jdk/EnumMap02.java |   0
 .../compiler/graal/jtt/jdk/IntegerBits.java   |   0
 .../graal/jtt/jdk/IntegerShuffleBitsTest.java |   0
 .../jdk/compiler/graal/jtt/jdk/LongBits.java  |   0
 .../graal/jtt/jdk/LongShuffleBitsTest.java    |   0
 .../jdk/compiler/graal/jtt/jdk/ShortBits.java |   0
 .../jtt/jdk/System_currentTimeMillis01.java   |   0
 .../jtt/jdk/System_currentTimeMillis02.java   |   0
 .../graal/jtt/jdk/System_nanoTime01.java      |   0
 .../graal/jtt/jdk/System_nanoTime02.java      |   0
 .../compiler/graal/jtt/jdk/System_setOut.java |   0
 .../graal/jtt/jdk/Thread_setName.java         |   0
 .../graal/jtt/jdk/UnsafeAccess01.java         |   0
 .../jtt/jdk/UnsafeAllocateInstance01.java     |   0
 .../graal/jtt/jdk/Unsafe_compareAndSwap.java  |   0
 .../jdk/Unsafe_compareAndSwapNullCheck.java   |   0
 .../graal/jtt/lang/Boxed_TYPE_01.java         |   0
 .../graal/jtt/lang/Bridge_method01.java       |   0
 .../graal/jtt/lang/CheckedListTest.java       |   0
 .../jtt/lang/ClassLoader_loadClass01.java     |   0
 .../graal/jtt/lang/Class_Literal01.java       |   0
 .../graal/jtt/lang/Class_asSubclass01.java    |   0
 .../compiler/graal/jtt/lang/Class_cast01.java |   0
 .../compiler/graal/jtt/lang/Class_cast02.java |   0
 .../graal/jtt/lang/Class_forName01.java       |   0
 .../graal/jtt/lang/Class_forName02.java       |   0
 .../graal/jtt/lang/Class_forName03.java       |   0
 .../graal/jtt/lang/Class_forName04.java       |   0
 .../graal/jtt/lang/Class_forName05.java       |   0
 .../jtt/lang/Class_getComponentType01.java    |   0
 .../graal/jtt/lang/Class_getInterfaces01.java |   0
 .../graal/jtt/lang/Class_getModifiers01.java  |   0
 .../graal/jtt/lang/Class_getModifiers02.java  |   0
 .../graal/jtt/lang/Class_getName01.java       |   0
 .../graal/jtt/lang/Class_getName02.java       |   0
 .../graal/jtt/lang/Class_getSimpleName01.java |   0
 .../graal/jtt/lang/Class_getSimpleName02.java |   0
 .../graal/jtt/lang/Class_getSuperClass01.java |   0
 .../graal/jtt/lang/Class_isArray01.java       |   0
 .../jtt/lang/Class_isAssignableFrom01.java    |   0
 .../jtt/lang/Class_isAssignableFrom02.java    |   0
 .../jtt/lang/Class_isAssignableFrom03.java    |   0
 .../graal/jtt/lang/Class_isInstance01.java    |   0
 .../graal/jtt/lang/Class_isInstance02.java    |   0
 .../graal/jtt/lang/Class_isInstance03.java    |   0
 .../graal/jtt/lang/Class_isInstance04.java    |   0
 .../graal/jtt/lang/Class_isInstance05.java    |   0
 .../graal/jtt/lang/Class_isInstance06.java    |   0
 .../graal/jtt/lang/Class_isInstance07.java    |   0
 .../graal/jtt/lang/Class_isInterface01.java   |   0
 .../graal/jtt/lang/Class_isPrimitive01.java   |   0
 .../compiler/graal/jtt/lang/Double_01.java    |   0
 .../graal/jtt/lang/Double_conditional.java    |   0
 .../graal/jtt/lang/Double_isInfinite.java     |   0
 .../graal/jtt/lang/Double_toString.java       |   0
 .../jdk/compiler/graal/jtt/lang/Float_01.java |   0
 .../jdk/compiler/graal/jtt/lang/Float_02.java |   0
 .../jdk/compiler/graal/jtt/lang/Float_03.java |   0
 .../graal/jtt/lang/Float_conditional.java     |   0
 .../graal/jtt/lang/Float_isInfinite.java      |   0
 .../graal/jtt/lang/Int_greater01.java         |   0
 .../graal/jtt/lang/Int_greater02.java         |   0
 .../graal/jtt/lang/Int_greater03.java         |   0
 .../graal/jtt/lang/Int_greaterEqual01.java    |   0
 .../graal/jtt/lang/Int_greaterEqual02.java    |   0
 .../graal/jtt/lang/Int_greaterEqual03.java    |   0
 .../compiler/graal/jtt/lang/Int_less01.java   |   0
 .../compiler/graal/jtt/lang/Int_less02.java   |   0
 .../compiler/graal/jtt/lang/Int_less03.java   |   0
 .../graal/jtt/lang/Int_lessEqual01.java       |   0
 .../graal/jtt/lang/Int_lessEqual02.java       |   0
 .../graal/jtt/lang/Int_lessEqual03.java       |   0
 .../graal/jtt/lang/Int_reverseBits.java       |   0
 .../graal/jtt/lang/JDK_ClassLoaders01.java    |   0
 .../graal/jtt/lang/JDK_ClassLoaders02.java    |   0
 .../graal/jtt/lang/LambdaEagerTest.java       |   0
 .../graal/jtt/lang/Long_greater01.java        |   0
 .../graal/jtt/lang/Long_greater02.java        |   0
 .../graal/jtt/lang/Long_greater03.java        |   0
 .../graal/jtt/lang/Long_greaterEqual01.java   |   0
 .../graal/jtt/lang/Long_greaterEqual02.java   |   0
 .../graal/jtt/lang/Long_greaterEqual03.java   |   0
 .../compiler/graal/jtt/lang/Long_less01.java  |   0
 .../compiler/graal/jtt/lang/Long_less02.java  |   0
 .../compiler/graal/jtt/lang/Long_less03.java  |   0
 .../graal/jtt/lang/Long_lessEqual01.java      |   0
 .../graal/jtt/lang/Long_lessEqual02.java      |   0
 .../graal/jtt/lang/Long_lessEqual03.java      |   0
 .../graal/jtt/lang/Long_reverseBits.java      |   0
 .../graal/jtt/lang/Long_reverseBytes01.java   |   0
 .../graal/jtt/lang/Long_reverseBytes02.java   |   0
 .../jdk/compiler/graal/jtt/lang/Math_abs.java |   0
 .../graal/jtt/lang/Math_copySign.java         |   0
 .../jdk/compiler/graal/jtt/lang/Math_cos.java |   0
 .../compiler/graal/jtt/lang/Math_exact.java   |   0
 .../jdk/compiler/graal/jtt/lang/Math_exp.java |   0
 .../jdk/compiler/graal/jtt/lang/Math_log.java |   0
 .../compiler/graal/jtt/lang/Math_log10.java   |   0
 .../compiler/graal/jtt/lang/Math_minMax.java  |   0
 .../jdk/compiler/graal/jtt/lang/Math_pow.java |   0
 .../compiler/graal/jtt/lang/Math_round.java   |   0
 .../compiler/graal/jtt/lang/Math_signum.java  |   0
 .../jdk/compiler/graal/jtt/lang/Math_sin.java |   0
 .../compiler/graal/jtt/lang/Math_sqrt.java    |   0
 .../jdk/compiler/graal/jtt/lang/Math_tan.java |   0
 .../graal/jtt/lang/Object_clone01.java        |   0
 .../graal/jtt/lang/Object_clone02.java        |   0
 .../graal/jtt/lang/Object_equals01.java       |   0
 .../graal/jtt/lang/Object_getClass01.java     |   0
 .../graal/jtt/lang/Object_hashCode01.java     |   0
 .../graal/jtt/lang/Object_hashCode02.java     |   0
 .../graal/jtt/lang/Object_notify01.java       |   0
 .../graal/jtt/lang/Object_notify02.java       |   0
 .../graal/jtt/lang/Object_notifyAll01.java    |   0
 .../graal/jtt/lang/Object_notifyAll02.java    |   0
 .../graal/jtt/lang/Object_toString01.java     |   0
 .../graal/jtt/lang/Object_toString02.java     |   0
 .../graal/jtt/lang/Object_wait01.java         |   0
 .../graal/jtt/lang/Object_wait02.java         |   0
 .../graal/jtt/lang/Object_wait03.java         |   0
 .../jtt/lang/ProcessEnvironment_init.java     |   0
 .../graal/jtt/lang/StringCoding_Scale.java    |   0
 .../graal/jtt/lang/String_intern01.java       |   0
 .../graal/jtt/lang/String_intern02.java       |   0
 .../graal/jtt/lang/String_intern03.java       |   0
 .../graal/jtt/lang/String_valueOf01.java      |   0
 .../jtt/lang/System_identityHashCode01.java   |   0
 .../compiler/graal/jtt/lang/UnaryMath.java    |   0
 .../graal/jtt/loop/DegeneratedLoop.java       |   0
 .../jdk/compiler/graal/jtt/loop/Loop01.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop02.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop03.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop04.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop05.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop06.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop07.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop07_2.java |   0
 .../jdk/compiler/graal/jtt/loop/Loop08.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop09.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop09_2.java |   0
 .../jdk/compiler/graal/jtt/loop/Loop11.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop12.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop13.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop14.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop15.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop16.java   |   0
 .../jdk/compiler/graal/jtt/loop/Loop17.java   |   0
 .../compiler/graal/jtt/loop/LoopEscape.java   |   0
 .../compiler/graal/jtt/loop/LoopInline.java   |   0
 .../graal/jtt/loop/LoopLastIndexOf.java       |   0
 .../graal/jtt/loop/LoopNewInstance.java       |   0
 .../graal/jtt/loop/LoopParseLong.java         |   0
 .../jdk/compiler/graal/jtt/loop/LoopPhi.java  |   0
 .../graal/jtt/loop/LoopPhiResolutionTest.java |   0
 .../compiler/graal/jtt/loop/LoopSpilling.java |   0
 .../compiler/graal/jtt/loop/LoopSwitch01.java |   0
 .../compiler/graal/jtt/loop/LoopUnroll.java   |   0
 .../SpillLoopPhiVariableAtDefinition.java     |   0
 .../graal/jtt/micro/ArrayCompare01.java       |   0
 .../graal/jtt/micro/ArrayCompare02.java       |   0
 .../graal/jtt/micro/BC_invokevirtual2.java    |   0
 .../graal/jtt/micro/BigByteParams01.java      |   0
 .../graal/jtt/micro/BigDoubleParams02.java    |   0
 .../graal/jtt/micro/BigFloatParams01.java     |   0
 .../graal/jtt/micro/BigFloatParams02.java     |   0
 .../graal/jtt/micro/BigIntParams01.java       |   0
 .../graal/jtt/micro/BigIntParams02.java       |   0
 .../graal/jtt/micro/BigInterfaceParams01.java |   0
 .../graal/jtt/micro/BigLongParams02.java      |   0
 .../graal/jtt/micro/BigMixedParams01.java     |   0
 .../graal/jtt/micro/BigMixedParams02.java     |   0
 .../graal/jtt/micro/BigMixedParams03.java     |   0
 .../graal/jtt/micro/BigMixedParams04.java     |   0
 .../graal/jtt/micro/BigObjectParams01.java    |   0
 .../graal/jtt/micro/BigObjectParams02.java    |   0
 .../graal/jtt/micro/BigParamsAlignment.java   |   0
 .../graal/jtt/micro/BigShortParams01.java     |   0
 .../graal/jtt/micro/BigVirtualParams01.java   |   0
 .../compiler/graal/jtt/micro/Bubblesort.java  |   0
 .../graal/jtt/micro/ConstantLoadTest.java     |   0
 .../compiler/graal/jtt/micro/Fibonacci.java   |   0
 .../graal/jtt/micro/FloatingReads.java        |   0
 .../graal/jtt/micro/InvokeInterface_01.java   |   0
 .../graal/jtt/micro/InvokeInterface_02.java   |   0
 .../graal/jtt/micro/InvokeInterface_03.java   |   0
 .../graal/jtt/micro/InvokeInterface_04.java   |   0
 .../graal/jtt/micro/InvokeVirtual_01.java     |   0
 .../graal/jtt/micro/InvokeVirtual_02.java     |   0
 .../compiler/graal/jtt/micro/Matrix01.java    |   0
 .../graal/jtt/micro/ReferenceMap01.java       |   0
 .../graal/jtt/micro/StrangeFrames.java        |   0
 .../graal/jtt/micro/String_format01.java      |   0
 .../graal/jtt/micro/String_format02.java      |   0
 .../graal/jtt/micro/VarArgs_String01.java     |   0
 .../graal/jtt/micro/VarArgs_Unroll.java       |   0
 .../graal/jtt/micro/VarArgs_boolean01.java    |   0
 .../graal/jtt/micro/VarArgs_byte01.java       |   0
 .../graal/jtt/micro/VarArgs_char01.java       |   0
 .../graal/jtt/micro/VarArgs_double01.java     |   0
 .../graal/jtt/micro/VarArgs_float01.java      |   0
 .../graal/jtt/micro/VarArgs_int01.java        |   0
 .../graal/jtt/micro/VarArgs_long01.java       |   0
 .../graal/jtt/micro/VarArgs_short01.java      |   0
 .../compiler/graal/jtt/optimize/ABCE_01.java  |   0
 .../compiler/graal/jtt/optimize/ABCE_02.java  |   0
 .../compiler/graal/jtt/optimize/ABCE_03.java  |   0
 .../graal/jtt/optimize/ArrayCopy01.java       |   0
 .../graal/jtt/optimize/ArrayCopy02.java       |   0
 .../graal/jtt/optimize/ArrayCopy03.java       |   0
 .../graal/jtt/optimize/ArrayCopy04.java       |   0
 .../graal/jtt/optimize/ArrayCopy05.java       |   0
 .../graal/jtt/optimize/ArrayCopy06.java       |   0
 .../graal/jtt/optimize/ArrayCopyGeneric.java  |   0
 .../graal/jtt/optimize/ArrayLength01.java     |   0
 .../graal/jtt/optimize/BC_idiv_16.java        |   0
 .../graal/jtt/optimize/BC_idiv_4.java         |   0
 .../graal/jtt/optimize/BC_imul_16.java        |   0
 .../graal/jtt/optimize/BC_imul_4.java         |   0
 .../graal/jtt/optimize/BC_ldiv_16.java        |   0
 .../graal/jtt/optimize/BC_ldiv_4.java         |   0
 .../graal/jtt/optimize/BC_lmul_16.java        |   0
 .../graal/jtt/optimize/BC_lmul_4.java         |   0
 .../graal/jtt/optimize/BC_lshr_C16.java       |   0
 .../graal/jtt/optimize/BC_lshr_C24.java       |   0
 .../graal/jtt/optimize/BC_lshr_C32.java       |   0
 .../graal/jtt/optimize/BlockSkip01.java       |   0
 .../graal/jtt/optimize/BoxingIdentity.java    |   0
 .../graal/jtt/optimize/CE_InstanceOf.java     |   0
 .../compiler/graal/jtt/optimize/Cmov01.java   |   0
 .../compiler/graal/jtt/optimize/Cmov02.java   |   0
 .../graal/jtt/optimize/Conditional01.java     |   0
 .../optimize/ConditionalElimination01.java    |   0
 .../optimize/ConditionalElimination02.java    |   0
 .../graal/jtt/optimize/ConvertCompare.java    |   0
 .../graal/jtt/optimize/DeadCode01.java        |   0
 .../graal/jtt/optimize/DeadCode02.java        |   0
 .../graal/jtt/optimize/Fold_Cast01.java       |   0
 .../graal/jtt/optimize/Fold_Convert01.java    |   0
 .../graal/jtt/optimize/Fold_Convert02.java    |   0
 .../graal/jtt/optimize/Fold_Convert03.java    |   0
 .../graal/jtt/optimize/Fold_Convert04.java    |   0
 .../graal/jtt/optimize/Fold_Double01.java     |   0
 .../graal/jtt/optimize/Fold_Double02.java     |   0
 .../graal/jtt/optimize/Fold_Double03.java     |   0
 .../graal/jtt/optimize/Fold_Double04.java     |   0
 .../graal/jtt/optimize/Fold_Float01.java      |   0
 .../graal/jtt/optimize/Fold_Float02.java      |   0
 .../graal/jtt/optimize/Fold_Float03.java      |   0
 .../graal/jtt/optimize/Fold_InstanceOf01.java |   0
 .../graal/jtt/optimize/Fold_Int01.java        |   0
 .../graal/jtt/optimize/Fold_Int02.java        |   0
 .../graal/jtt/optimize/Fold_Long01.java       |   0
 .../graal/jtt/optimize/Fold_Long02.java       |   0
 .../graal/jtt/optimize/Fold_Math01.java       |   0
 .../graal/jtt/optimize/GuardMovement.java     |   0
 .../optimize/IfNodeCanonicalizationsTest.java |   0
 .../graal/jtt/optimize/InferStamp01.java      |   0
 .../compiler/graal/jtt/optimize/Inline01.java |   0
 .../compiler/graal/jtt/optimize/Inline02.java |   0
 .../graal/jtt/optimize/InstanceOf.java        |   0
 .../compiler/graal/jtt/optimize/LLE_01.java   |   0
 .../graal/jtt/optimize/List_reorder_bug.java  |   0
 .../compiler/graal/jtt/optimize/Logic0.java   |   0
 .../jtt/optimize/LongToSomethingArray01.java  |   0
 .../compiler/graal/jtt/optimize/NCE_01.java   |   0
 .../compiler/graal/jtt/optimize/NCE_02.java   |   0
 .../compiler/graal/jtt/optimize/NCE_03.java   |   0
 .../compiler/graal/jtt/optimize/NCE_04.java   |   0
 .../jtt/optimize/NCE_FlowSensitive01.java     |   0
 .../jtt/optimize/NCE_FlowSensitive02.java     |   0
 .../jtt/optimize/NCE_FlowSensitive03.java     |   0
 .../jtt/optimize/NCE_FlowSensitive04.java     |   0
 .../jtt/optimize/NCE_FlowSensitive05.java     |   0
 .../graal/jtt/optimize/Narrow_byte01.java     |   0
 .../graal/jtt/optimize/Narrow_byte02.java     |   0
 .../graal/jtt/optimize/Narrow_byte03.java     |   0
 .../graal/jtt/optimize/Narrow_byte04.java     |   0
 .../graal/jtt/optimize/Narrow_char01.java     |   0
 .../graal/jtt/optimize/Narrow_char02.java     |   0
 .../graal/jtt/optimize/Narrow_char03.java     |   0
 .../graal/jtt/optimize/Narrow_short01.java    |   0
 .../graal/jtt/optimize/Narrow_short02.java    |   0
 .../graal/jtt/optimize/Narrow_short03.java    |   0
 .../graal/jtt/optimize/NestedLoop_EA.java     |   0
 .../compiler/graal/jtt/optimize/Phi01.java    |   0
 .../compiler/graal/jtt/optimize/Phi02.java    |   0
 .../compiler/graal/jtt/optimize/Phi03.java    |   0
 .../jtt/optimize/ReassociateConstants.java    |   0
 .../graal/jtt/optimize/Reduce_Convert01.java  |   0
 .../graal/jtt/optimize/Reduce_Double01.java   |   0
 .../graal/jtt/optimize/Reduce_Float01.java    |   0
 .../graal/jtt/optimize/Reduce_Int01.java      |   0
 .../graal/jtt/optimize/Reduce_Int02.java      |   0
 .../graal/jtt/optimize/Reduce_Int03.java      |   0
 .../graal/jtt/optimize/Reduce_Int04.java      |   0
 .../graal/jtt/optimize/Reduce_IntShift01.java |   0
 .../graal/jtt/optimize/Reduce_IntShift02.java |   0
 .../graal/jtt/optimize/Reduce_Long01.java     |   0
 .../graal/jtt/optimize/Reduce_Long02.java     |   0
 .../graal/jtt/optimize/Reduce_Long03.java     |   0
 .../graal/jtt/optimize/Reduce_Long04.java     |   0
 .../jtt/optimize/Reduce_LongShift01.java      |   0
 .../jtt/optimize/Reduce_LongShift02.java      |   0
 .../graal/jtt/optimize/SchedulingBug_01.java  |   0
 .../graal/jtt/optimize/SignExtendShort.java   |   0
 .../compiler/graal/jtt/optimize/Switch01.java |   0
 .../compiler/graal/jtt/optimize/Switch02.java |   0
 .../jtt/optimize/SwitchHashTableTest.java     |   0
 .../graal/jtt/optimize/TrichotomyFloats.java  |   0
 .../graal/jtt/optimize/TrichotomyTest.java    |   0
 .../graal/jtt/optimize/TypeCastElem.java      |   0
 .../graal/jtt/optimize/UnsafeDeopt.java       |   0
 .../graal/jtt/optimize/VN_Cast01.java         |   0
 .../graal/jtt/optimize/VN_Cast02.java         |   0
 .../graal/jtt/optimize/VN_Convert01.java      |   0
 .../graal/jtt/optimize/VN_Convert02.java      |   0
 .../graal/jtt/optimize/VN_Double01.java       |   0
 .../graal/jtt/optimize/VN_Double02.java       |   0
 .../graal/jtt/optimize/VN_Double03.java       |   0
 .../graal/jtt/optimize/VN_Field01.java        |   0
 .../graal/jtt/optimize/VN_Field02.java        |   0
 .../graal/jtt/optimize/VN_Float01.java        |   0
 .../graal/jtt/optimize/VN_Float02.java        |   0
 .../graal/jtt/optimize/VN_InstanceOf01.java   |   0
 .../graal/jtt/optimize/VN_InstanceOf02.java   |   0
 .../graal/jtt/optimize/VN_InstanceOf03.java   |   0
 .../compiler/graal/jtt/optimize/VN_Int01.java |   0
 .../compiler/graal/jtt/optimize/VN_Int02.java |   0
 .../compiler/graal/jtt/optimize/VN_Int03.java |   0
 .../graal/jtt/optimize/VN_Long01.java         |   0
 .../graal/jtt/optimize/VN_Long02.java         |   0
 .../graal/jtt/optimize/VN_Long03.java         |   0
 .../graal/jtt/optimize/VN_Loop01.java         |   0
 .../graal/jtt/reflect/Array_get01.java        |   0
 .../graal/jtt/reflect/Array_get02.java        |   0
 .../graal/jtt/reflect/Array_get03.java        |   0
 .../graal/jtt/reflect/Array_getBoolean01.java |   0
 .../graal/jtt/reflect/Array_getByte01.java    |   0
 .../graal/jtt/reflect/Array_getChar01.java    |   0
 .../graal/jtt/reflect/Array_getDouble01.java  |   0
 .../graal/jtt/reflect/Array_getFloat01.java   |   0
 .../graal/jtt/reflect/Array_getInt01.java     |   0
 .../graal/jtt/reflect/Array_getLength01.java  |   0
 .../graal/jtt/reflect/Array_getLong01.java    |   0
 .../graal/jtt/reflect/Array_getShort01.java   |   0
 .../jtt/reflect/Array_newInstance01.java      |   0
 .../jtt/reflect/Array_newInstance02.java      |   0
 .../jtt/reflect/Array_newInstance03.java      |   0
 .../jtt/reflect/Array_newInstance04.java      |   0
 .../jtt/reflect/Array_newInstance05.java      |   0
 .../jtt/reflect/Array_newInstance06.java      |   0
 .../graal/jtt/reflect/Array_set01.java        |   0
 .../graal/jtt/reflect/Array_set02.java        |   0
 .../graal/jtt/reflect/Array_set03.java        |   0
 .../graal/jtt/reflect/Array_setBoolean01.java |   0
 .../graal/jtt/reflect/Array_setByte01.java    |   0
 .../graal/jtt/reflect/Array_setChar01.java    |   0
 .../graal/jtt/reflect/Array_setDouble01.java  |   0
 .../graal/jtt/reflect/Array_setFloat01.java   |   0
 .../graal/jtt/reflect/Array_setInt01.java     |   0
 .../graal/jtt/reflect/Array_setLong01.java    |   0
 .../graal/jtt/reflect/Array_setShort01.java   |   0
 .../jtt/reflect/Class_getDeclaredField01.java |   0
 .../reflect/Class_getDeclaredMethod01.java    |   0
 .../graal/jtt/reflect/Class_getField01.java   |   0
 .../graal/jtt/reflect/Class_getField02.java   |   0
 .../graal/jtt/reflect/Class_getMethod01.java  |   0
 .../graal/jtt/reflect/Class_getMethod02.java  |   0
 .../jtt/reflect/Class_newInstance01.java      |   0
 .../jtt/reflect/Class_newInstance02.java      |   0
 .../jtt/reflect/Class_newInstance03.java      |   0
 .../jtt/reflect/Class_newInstance06.java      |   0
 .../jtt/reflect/Class_newInstance07.java      |   0
 .../graal/jtt/reflect/Field_get01.java        |   0
 .../graal/jtt/reflect/Field_get02.java        |   0
 .../graal/jtt/reflect/Field_get03.java        |   0
 .../graal/jtt/reflect/Field_get04.java        |   0
 .../graal/jtt/reflect/Field_getType01.java    |   0
 .../graal/jtt/reflect/Field_set01.java        |   0
 .../graal/jtt/reflect/Field_set02.java        |   0
 .../graal/jtt/reflect/Field_set03.java        |   0
 .../graal/jtt/reflect/Invoke_except01.java    |   0
 .../graal/jtt/reflect/Invoke_main01.java      |   0
 .../graal/jtt/reflect/Invoke_main02.java      |   0
 .../graal/jtt/reflect/Invoke_main03.java      |   0
 .../graal/jtt/reflect/Invoke_virtual01.java   |   0
 .../reflect/Method_getParameterTypes01.java   |   0
 .../jtt/reflect/Method_getReturnType01.java   |   0
 .../jtt/threads/Monitor_contended01.java      |   0
 .../graal/jtt/threads/Monitor_notowner01.java |   0
 .../graal/jtt/threads/Monitorenter01.java     |   0
 .../graal/jtt/threads/Monitorenter02.java     |   0
 .../graal/jtt/threads/Object_wait01.java      |   0
 .../graal/jtt/threads/Object_wait02.java      |   0
 .../graal/jtt/threads/Object_wait03.java      |   0
 .../graal/jtt/threads/Object_wait04.java      |   0
 .../jtt/threads/SynchronizedLoopExit01.java   |   0
 .../threads/SynchronizedParserInlineTest.java |   0
 .../graal/jtt/threads/ThreadLocal01.java      |   0
 .../graal/jtt/threads/ThreadLocal02.java      |   0
 .../graal/jtt/threads/ThreadLocal03.java      |   0
 .../jtt/threads/Thread_currentThread01.java   |   0
 .../graal/jtt/threads/Thread_getState01.java  |   0
 .../graal/jtt/threads/Thread_getState02.java  |   0
 .../graal/jtt/threads/Thread_holdsLock01.java |   0
 .../graal/jtt/threads/Thread_isAlive01.java   |   0
 .../jtt/threads/Thread_isInterrupted01.java   |   0
 .../jtt/threads/Thread_isInterrupted02.java   |   0
 .../jtt/threads/Thread_isInterrupted03.java   |   0
 .../jtt/threads/Thread_isInterrupted04.java   |   0
 .../jtt/threads/Thread_isInterrupted05.java   |   0
 .../graal/jtt/threads/Thread_join01.java      |   0
 .../graal/jtt/threads/Thread_join02.java      |   0
 .../graal/jtt/threads/Thread_join03.java      |   0
 .../graal/jtt/threads/Thread_new01.java       |   0
 .../graal/jtt/threads/Thread_new02.java       |   0
 .../jtt/threads/Thread_setPriority01.java     |   0
 .../graal/jtt/threads/Thread_sleep01.java     |   0
 .../graal/jtt/threads/Thread_yield01.java     |   0
 .../graal/lir/jtt/ConstantStackCastTest.java  |   0
 .../jdk/compiler/graal/lir/jtt/LIRTest.java   |   0
 .../graal/lir/jtt/LIRTestSpecification.java   |   0
 .../compiler/graal/lir/jtt/LIRTestTest.java   |   0
 .../compiler/graal/lir/jtt/StackMoveTest.java |   0
 .../graal/lir/jtt/StackStoreLoadTest.java     |   0
 .../test/CompositeValueReplacementTest1.java  |   0
 .../graal/lir/test/GenericValueMapTest.java   |   0
 .../loop/test/LoopPartialUnrollTest.java      |   0
 .../graal/loop/test/LoopsDataTest.java        |   0
 .../nodes/test/AbstractObjectStampTest.java   |   0
 .../graal/nodes/test/AddNodeTest.java         |   0
 .../test/AndNodeCanonicalizationTest.java     |   0
 .../CompareZeroExtendWithConstantTest.java    |   0
 .../graal/nodes/test/ConstantNodeTest.java    |   0
 .../nodes/test/ExceptionLivenessTest.java     |   0
 .../graal/nodes/test/FloatStampTest.java      |   0
 .../graal/nodes/test/GraphStateTest.java      |   0
 .../test/IfNodeCanonicalizationTest.java      |   0
 .../test/IfNodeCanonicalizationTest2.java     |   0
 .../graal/nodes/test/InliningLogTest.java     |   0
 .../test/IntegerShuffleBitsStampTest.java     |   0
 .../nodes/test/IntegerStampFoldTest.java      |   0
 .../nodes/test/IntegerStampMaskTest.java      |   0
 .../graal/nodes/test/IntegerStampTest.java    |   0
 .../nodes/test/LongShuffleBitsStampTest.java  |   0
 .../graal/nodes/test/LoopLivenessTest.java    |   0
 .../nodes/test/LoopPhiCanonicalizerTest.java  |   0
 .../nodes/test/NarrowPreservesOrderTest.java  |   0
 .../compiler/graal/nodes/test/NarrowTest.java |   0
 .../test/NegateNodeCanonicalizationTest.java  |   0
 .../graal/nodes/test/ObjectStampJoinTest.java |   0
 .../graal/nodes/test/ObjectStampMeetTest.java |   0
 .../graal/nodes/test/ObjectStampTest.java     |   0
 .../graal/nodes/test/OptimizationLogTest.java |   0
 .../test/OrNodeCanonicalizationTest.java      |   0
 .../test/PrimitiveStampBoundaryTest.java      |   0
 .../ReinterpretStampDoubleToLongTest.java     |   0
 .../test/ReinterpretStampFloatToIntTest.java  |   0
 .../test/ReinterpretStampIntToFloatTest.java  |   0
 .../ReinterpretStampLongToDoubleTest.java     |   0
 .../nodes/test/ReinterpretStampTest.java      |   0
 .../nodes/test/ShortCircuitOrNodeTest.java    |   0
 .../graal/nodes/test/StampInverterTest.java   |   0
 .../graal/nodes/test/StampToolTest.java       |   0
 .../nodes/test/StaticFieldAccessTest.java     |   0
 .../graal/nodes/test/StructuredGraphTest.java |   0
 .../nodes/test/SubCanonicalizationTest.java   |   0
 .../test/TruncateCanonicalizationTest.java    |   0
 .../test/XorNodeCanonicalizationTest.java     |   0
 .../test/NestedBooleanOptionKeyTest.java      |   0
 .../graal/options/test/TestOptionKey.java     |   0
 .../phases/common/test/StampFactoryTest.java  |   0
 .../test/ArrayCopyExceptionSeenTest.java      |   0
 .../test/ArrayEqualsConstantLengthTest.java   |   0
 .../test/ArrayStoreBytecodeExceptionTest.java |   0
 .../test/ArraysSubstitutionsTest.java         |   0
 .../test/ArraysSubstitutionsTestBase.java     |   0
 .../replacements/test/BitOpNodesTest.java     |   0
 .../test/BytecodeExceptionTest.java           |   0
 .../replacements/test/CharIsDigitTest.java    |   0
 .../replacements/test/CheckIndexTest.java     |   0
 .../test/ClassCastBytecodeExceptionTest.java  |   0
 .../test/CompiledExceptionHandlerTest.java    |   0
 .../CompiledNullPointerExceptionTest.java     |   0
 .../replacements/test/CountPositivesTest.java |   0
 .../test/DeoptimizeOnExceptionTest.java       |   0
 .../test/DeoptimizeOnIntegerExactTest.java    |   0
 .../test/DeoptimizeOnVolatileReadTest.java    |   0
 .../replacements/test/DerivedOopTest.java     |   0
 .../test/DynamicNewArrayTest.java             |   0
 .../graal/replacements/test/EdgesTest.java    |   0
 .../replacements/test/EncodeArrayTest.java    |   0
 .../test/FloatArraysEqualsTest.java           |   0
 .../replacements/test/HalfFloatTest.java      |   0
 .../replacements/test/HasNegativesTest.java   |   0
 .../test/IndexOobBytecodeExceptionTest.java   |   0
 .../test/InstanceOfDynamicTest.java           |   0
 .../replacements/test/InstanceOfTest.java     |   0
 .../test/IntegerExactExceptionTest.java       |   0
 .../test/IntegerExactFoldTest.java            |   0
 .../test/IntegerSubOverflowsTest.java         |   0
 .../graal/replacements/test/InvokeTest.java   |   0
 .../test/InvokerSignatureMismatchTest.java    |   0
 .../test/MathMultiplyHighTest.java            |   0
 .../replacements/test/MathRoundTest.java      |   0
 .../test/MethodHandleImplTest.java            |   0
 .../test/MethodHandleMacroTest.java           |   0
 .../test/MethodSubstitutionTest.java          |   0
 .../graal/replacements/test/MonitorTest.java  |   0
 .../test/NestedExceptionHandlerTest.java      |   0
 .../graal/replacements/test/NewArrayTest.java |   0
 .../replacements/test/NewInstanceTest.java    |   0
 .../replacements/test/NewMultiArrayTest.java  |   0
 .../test/NullBytecodeExceptionTest.java       |   0
 .../replacements/test/ObjectAccessTest.java   |   0
 .../replacements/test/PEGraphDecoderTest.java |   0
 .../graal/replacements/test/PointerTest.java  |   0
 .../test/PointerTrackingTest.java             |   0
 .../replacements/test/ReplacementsTest.java   |   0
 .../graal/replacements/test/SnippetsTest.java |   0
 .../test/StandardMethodSubstitutionsTest.java |   0
 .../test/StringCompareToAVX512Test.java       |   0
 .../test/StringCompareToTest.java             |   0
 .../test/StringCompressInflateTest.java       |   0
 .../test/StringEqualsConstantTest.java        |   0
 .../replacements/test/StringEqualsTest.java   |   0
 .../replacements/test/StringGetBytesTest.java |   0
 .../test/StringHashConstantTest.java          |   0
 .../StringIndexOfCharConstantBindingTest.java |   0
 .../test/StringIndexOfCharTest.java           |   0
 .../test/StringIndexOfConstantTest.java       |   0
 .../test/StringIndexOfDeoptimizeTest.java     |   0
 .../replacements/test/StringIndexOfTest.java  |   0
 .../test/StringIndexOfTestBase.java           |   0
 .../test/StringIntrinsicRangeChecksTest.java  |   0
 .../test/StringSubstitutionTestBase.java      |   0
 .../test/StringSubstitutionsTest.java         |   0
 .../SubstitutionNodeSourcePositionTest.java   |   0
 .../test/SystemArrayCopyTest.java             |   0
 .../replacements/test/TypeCheckTest.java      |   0
 .../test/UnsafeBooleanAccessTest.java         |   0
 .../test/UnsafeObjectReplacementsTest.java    |   0
 .../test/UnsafeReplacementsTest.java          |   0
 .../test/UnsafeSubstitutionsTest.java         |   0
 .../test/UnsignedIntegerTest.java             |   0
 .../replacements/test/UnsignedMathTest.java   |   0
 .../test/UnwindExceptionToCallerTest.java     |   0
 .../replacements/test/VarHandleTest.java      |   0
 .../test/VectorizedHashCodeTest.java          |   0
 .../graal/replacements/test/WordTest.java     |   0
 .../ClassfileBytecodeProviderTest.java        |   0
 .../jdk/compiler/graal/test/AddExports.java   |   0
 .../src/jdk/compiler/graal/test/AddJVM.java   |   0
 .../jdk/compiler/graal/test/AddModules.java   |   0
 .../jdk/compiler/graal/test/CommandLine.java  |   0
 .../compiler/graal/test/CountUppercase.java   |   0
 .../jdk/compiler/graal/test/GraalTest.java    |   0
 .../compiler/graal/test/SubprocessUtil.java   |   0
 .../test/AOTSupportCompilationTest.java       |   0
 .../test/AbstractSplittingStrategyTest.java   |   0
 .../graal/truffle/test/AddExports.java        |   0
 .../test/AgnosticInliningPhaseTest.java       |   0
 ...locationReporterPartialEvaluationTest.java |   0
 .../test/ArrayUtilsIndexOfWithMaskTest.java   |   0
 ...UtilsRegionEqualsWithMaskConstantTest.java |   0
 .../ArrayUtilsRegionEqualsWithMaskTest.java   |   0
 .../graal/truffle/test/ArrayUtilsTest.java    |   0
 .../AssumedValuePartialEvaluationTest.java    |   0
 .../test/AssumptionPartialEvaluationTest.java |   0
 .../test/BailoutPartialEvaluationTest.java    |   0
 .../test/BeginNodeOptimizationTest.java       |   0
 ...ecodeInterpreterPartialEvaluationTest.java |   0
 .../truffle/test/BytecodeOSRNodeTest.java     |   0
 .../test/CachedLibraryCompilationTest.java    |   0
 .../test/CastExactPartialEvaluationTest.java  |   0
 .../truffle/test/CodeInvalidationTest.java    |   0
 ...CompilationFinalPartialEvaluationTest.java |   0
 ...nalWeakReferencePartialEvaluationTest.java |   0
 .../truffle/test/CompilationMemoryTest.java   |   0
 .../truffle/test/CompilerAssertsTest.java     |   0
 .../test/CompilerDirectivesTypeTest.java      |   0
 .../test/CompilerInitializationTest.java      |   0
 .../truffle/test/CompilerLoggingTest.java     |   0
 .../truffle/test/CompilerOptionTest.java      |   0
 .../truffle/test/ConditionAnchoringTest.java  |   0
 .../test/ContextLookupCompilationTest.java    |   0
 ...rolFlowExceptionPartialEvaluationTest.java |   0
 .../test/DFAPartialEvaluationTest.java        |   0
 .../graal/truffle/test/DefaultLoomTest.java   |   0
 .../truffle/test/DeoptInvalidateListener.java |   0
 .../DynamicObjectPartialEvaluationTest.java   |   0
 .../truffle/test/EncodedGraphCacheTest.java   |   0
 .../graal/truffle/test/EngineModeTest.java    |   0
 .../test/EnumPartialEvaluationTest.java       |   0
 .../graal/truffle/test/ExactMathTest.java     |   0
 .../truffle/test/ExceptionActionTest.java     |   0
 .../test/ExecutionListenerCompilerTest.java   |   0
 .../test/ExitDuringCompilationTest.java       |   0
 .../test/ExplodeLoopBlockDuplicationTest.java |   0
 .../test/FinalBitSetCompilationTest.java      |   0
 .../truffle/test/FlushEngineQueueTest.java    |   0
 .../test/FrameAccessVerificationTest.java     |   0
 .../truffle/test/FrameDescriptorTest.java     |   0
 .../truffle/test/FrameHostReadsTest.java      |   0
 .../graal/truffle/test/GR35581Test.java       |   0
 .../graal/truffle/test/GR36613Test.java       |   0
 .../test/GenerateInlineCompilationTest.java   |   0
 .../test/GetRootNodeCompilationTest.java      |   0
 .../test/GraalTruffleRuntimeListenerTest.java |   0
 .../truffle/test/HashCodeIntrinsicTest.java   |   0
 ...nliningBytecodeInterpreterExampleTest.java |   0
 .../HostInliningBytecodeInterpreterTest.java  |   0
 .../graal/truffle/test/HostInliningTest.java  |   0
 .../truffle/test/IndirectCallSiteTest.java    |   0
 .../test/InstrumentBranchesPhaseTest.java     |   0
 .../test/InstrumentationCompilerTest.java     |   0
 .../test/LanguageContextFreedTest.java        |   0
 .../LazyClassLoadingTargetNegativeTest.java   |   0
 .../LazyClassLoadingTargetPositiveTest.java   |   0
 .../truffle/test/LazyClassLoadingTest.java    |   0
 .../truffle/test/LibraryCompilationTest.java  |   0
 .../LibraryInheritanceCompilationTest.java    |   0
 .../test/LibrarySplittingStrategyTest.java    |   0
 .../graal/truffle/test/LoomUtils.java         |   0
 .../graal/truffle/test/LoopNodeOSRTest.java   |   0
 .../test/LoopNodePartialEvaluationTest.java   |   0
 .../truffle/test/MaterializedFrameTest.java   |   0
 .../truffle/test/MergeExplodeProxyTest.java   |   0
 .../MultiTierAssumptionInvalidationTest.java  |   0
 .../test/MultiTierCompilationTest.java        |   0
 .../truffle/test/NodeLibraryCompilerTest.java |   0
 .../test/NodeLibrarySLCompilerTest.java       |   0
 .../graal/truffle/test/NodeLimitTest.java     |   0
 .../test/NodeSplittingStrategyTest.java       |   0
 .../graal/truffle/test/OSRCancelTest.java     |   0
 ...tsRequireNonNullPartialEvaluationTest.java |   0
 .../truffle/test/OptimizedBlockNodeTest.java  |   0
 .../truffle/test/OptimizedCallTargetTest.java |   0
 .../graal/truffle/test/OptimizedLoomTest.java |   0
 .../test/OptimizedOSRLoopNodeTest.java        |   0
 .../truffle/test/OverrideOptionsTest.java     |   0
 .../truffle/test/PartialEvaluationTest.java   |   0
 .../truffle/test/PerformanceWarningTest.java  |   0
 ...hiStampInferencePartialEvaluationTest.java |   0
 .../graal/truffle/test/PhiTransformTest.java  |   0
 .../test/PolyglotEngineOptionsTest.java       |   0
 ...lyglotHostObjectPartialEvaluationTest.java |   0
 ...agateHotnessToLexicalSingleCallerTest.java |   0
 .../test/ResourceLimitsCompilationTest.java   |   0
 .../test/RewriteDuringCompilationTest.java    |   0
 .../test/SLCompileImmediatelyTestSuite.java   |   0
 .../truffle/test/SLTruffleGraalTestSuite.java |   0
 .../test/SafepointRethrowDeoptPETest.java     |   0
 .../test/SimplePartialEvaluationTest.java     |   0
 .../test/StaticObjectCompilationTest.java     |   0
 .../StringNodeInliningCompilationTest.java    |   0
 .../truffle/test/TestWithPolyglotOptions.java |   0
 .../test/TestWithSynchronousCompiling.java    |   0
 .../ThreadsActivationCompilationTest.java     |   0
 .../truffle/test/TraceCompilationTest.java    |   0
 .../test/TransferToInterpreterTest.java       |   0
 .../test/TruffleBoundaryExceptionsTest.java   |   0
 .../test/TruffleBoundaryInliningTest.java     |   0
 .../truffle/test/TruffleCompilerImplTest.java |   0
 .../test/TruffleContextCompilationTest.java   |   0
 .../test/TruffleDirectCallNodeTest.java       |   0
 .../test/TruffleEnsureVirtualizedTest.java    |   0
 ...TruffleExceptionPartialEvaluationTest.java |   0
 .../truffle/test/TruffleHostInliningTest.java |   0
 .../TruffleLoggerPartialEvaluationTest.java   |   0
 .../test/TruffleOptionsByClassLoaderTest.java |   0
 .../test/TruffleReturnBoxedParameterTest.java |   0
 .../truffle/test/TruffleRuntimeTest.java      |   0
 .../truffle/test/TruffleShutdownHookTest.java |   0
 ...ffleToTruffleCallExceptionHandlerTest.java |   0
 .../truffle/test/TruffleValueTypeTest.java    |   0
 .../test/UnrollLoopBlockDuplicationTest.java  |   0
 .../test/VarHandlePartialEvaluationTest.java  |   0
 .../test/builtins/SLAssertFalseBuiltin.java   |   0
 .../test/builtins/SLAssertTrueBuiltin.java    |   0
 .../test/builtins/SLAssertionError.java       |   0
 .../builtins/SLCallFunctionsWithBuiltin.java  |   0
 .../builtins/SLCallUntilOptimizedBuiltin.java |   0
 .../SLDeoptimizeWhenCompiledBuiltin.java      |   0
 .../builtins/SLDisableSplittingBuiltin.java   |   0
 .../test/builtins/SLGetOptionBuiltin.java     |   0
 .../test/builtins/SLGraalRuntimeBuiltin.java  |   0
 .../SLIsCompilationConstantBuiltin.java       |   0
 .../test/builtins/SLIsOptimizedBuiltin.java   |   0
 .../SLTestTruffleBoundary01Builtin.java       |   0
 .../SLWaitForOptimizationBuiltin.java         |   0
 .../test/collection/BTreeQueueTest.java       |   0
 .../DelegatingBlockingQueueTest.java          |   0
 .../truffle/test/inlining/InlineOnlyTest.java |   0
 .../truffle/test/inlining/InliningTest.java   |   0
 .../libgraal/JNIExceptionWrapperTest.java     |   0
 .../truffle/test/nodes/AbstractTestNode.java  |   0
 .../graal/truffle/test/nodes/AddTestNode.java |   0
 .../nodes/AssumptionCutsBranchTestNode.java   |   0
 .../truffle/test/nodes/BlockTestNode.java     |   0
 .../truffle/test/nodes/ConstantTestNode.java  |   0
 .../nodes/ConstantWithAssumptionTestNode.java |   0
 .../nodes/ExplodeLoopUntilReturnNode.java     |   0
 .../ExplodeLoopUntilReturnWithThrowNode.java  |   0
 .../test/nodes/InliningNullCheckNode1.java    |   0
 .../test/nodes/InliningNullCheckNode2.java    |   0
 .../truffle/test/nodes/IsLoggableNode.java    |   0
 .../truffle/test/nodes/LambdaTestNode.java    |   0
 .../truffle/test/nodes/LoadLocalTestNode.java |   0
 .../graal/truffle/test/nodes/LoggingNode.java |   0
 .../truffle/test/nodes/LoopTestNode.java      |   0
 .../nodes/NeverPartOfCompilationTestNode.java |   0
 .../test/nodes/NonConstantTestNode.java       |   0
 .../truffle/test/nodes/ObjectEqualsNode.java  |   0
 .../test/nodes/ObjectHashCodeNode.java        |   0
 .../test/nodes/PartialIntrinsicNode.java      |   0
 .../truffle/test/nodes/RecursionTestNode.java |   0
 .../truffle/test/nodes/RootTestNode.java      |   0
 .../test/nodes/StoreLocalTestNode.java        |   0
 .../truffle/test/nodes/StringEqualsNode.java  |   0
 .../test/nodes/StringHashCodeFinalNode.java   |   0
 .../nodes/StringHashCodeNonFinalNode.java     |   0
 .../nodes/SynchronizedExceptionMergeNode.java |   0
 .../truffle/test/nodes/TestNodeFactory.java   |   0
 .../test/nodes/UnrollLoopUntilReturnNode.java |   0
 .../UnrollLoopUntilReturnWithThrowNode.java   |   0
 .../nodes/explosion/LoopExplosionPhiNode.java |   0
 .../explosion/NestedExplodedLoopTestNode.java |   0
 .../TwoMergesExplodedLoopTestNode.java        |   0
 .../nodes/explosion/UnrollingTestNode.java    |   0
 .../strings/TStringConstantFoldingTest.java   |   0
 ...TStringOpsCalcStringAttributesBMPTest.java |   0
 ...ringOpsCalcStringAttributesLatin1Test.java |   0
 ...tringAttributesReturnValuesInSyncTest.java |   0
 ...tringOpsCalcStringAttributesUTF16Test.java |   0
 ...tringOpsCalcStringAttributesUTF32Test.java |   0
 ...StringOpsCalcStringAttributesUTF8Test.java |   0
 .../TStringOpsCompareConstantStrideTest.java  |   0
 .../TStringOpsCompareConstantTest.java        |   0
 .../test/strings/TStringOpsCompareTest.java   |   0
 .../TStringOpsCopyConstantStrideTest.java     |   0
 .../TStringOpsCopyReturnValueTest.java        |   0
 .../test/strings/TStringOpsCopyTest.java      |   0
 .../TStringOpsIndexOfAnyConstantTest.java     |   0
 .../TStringOpsIndexOfAnyRangeTest.java        |   0
 .../strings/TStringOpsIndexOfAnyTest.java     |   0
 .../strings/TStringOpsIndexOfTableTest.java   |   0
 ...gOpsIndexOfTwoConsecutiveConstantTest.java |   0
 .../TStringOpsIndexOfTwoConsecutiveTest.java  |   0
 ...ringOpsRegionEqualsConstantLengthTest.java |   0
 ...ringOpsRegionEqualsConstantStrideTest.java |   0
 .../TStringOpsRegionEqualsConstantTest.java   |   0
 .../strings/TStringOpsRegionEqualsTest.java   |   0
 .../truffle/test/strings/TStringOpsTest.java  |   0
 .../truffle/test/strings/TStringTest.java     |   0
 .../test/strings/VectorizedMismatchTest.java  |   0
 .../TRegexCompilerTestDummyLanguage.java      |   0
 .../TRegexTStringVirtualizationTest.java      |   0
 .../graal/util/test/AddModulesTest.java       |   0
 .../graal/util/test/CollectionSizeTest.java   |   0
 .../graal/util/test/CollectionUtilTest.java   |   0
 .../graal/util/test/JSONParserTest.java       |   0
 .../graal/util/test/ObjectSizeEstimate.java   |   2 +-
 .../graal/util/test/OptionsEncoderTest.java   |   0
 .../src/sl/TestCompilationThreshold.sl        |   0
 .../src/sl/TestDeoptInInlinedFunction.output  |   0
 .../src/sl/TestOSR.sl                         |   0
 .../src/sl/TestTruffleBoundary01.sl           |   0
 .../sl/disabled/TestIsCompilationConstant1.sl |   0
 .../graal/truffle/test/LoomUtils.java         |   0
 .../.checkstyle.exclude                       |   0
 .../virtual/bench/PartialEscapeBench.java     |   0
 .../.checkstyle_checks.xml                    |   0
 .../graal/api/directives/GraalDirectives.java |   0
 .../compiler/graal/api/replacements/Fold.java |   0
 .../graal/api/replacements/Snippet.java       |   0
 .../SnippetReflectionProvider.java            |   0
 .../replacements/SnippetTemplateCache.java    |   0
 .../graal/api/runtime/GraalJVMCICompiler.java |   0
 .../graal/api/runtime/GraalRuntime.java       |   0
 .../compiler/graal/asm/AbstractAddress.java   |   0
 .../jdk/compiler/graal/asm/AsmOptions.java    |   0
 .../src/jdk/compiler/graal/asm/Assembler.java |   0
 .../asm/BranchTargetOutOfBoundsException.java |   0
 .../src/jdk/compiler/graal/asm/Buffer.java    |   0
 .../src/jdk/compiler/graal/asm/Label.java     |   0
 .../jdk/compiler/graal/asm/VectorSize.java    |   0
 .../asm/aarch64/AArch64ASIMDAssembler.java    |   0
 .../aarch64/AArch64ASIMDMacroAssembler.java   |   0
 .../graal/asm/aarch64/AArch64Address.java     |   0
 .../graal/asm/aarch64/AArch64Assembler.java   |   0
 .../asm/aarch64/AArch64MacroAssembler.java    |   0
 .../compiler/graal/asm/aarch64/ASIMDKind.java |   0
 .../graal/asm/amd64/AMD64Address.java         |   0
 .../graal/asm/amd64/AMD64Assembler.java       |   0
 .../graal/asm/amd64/AMD64BaseAssembler.java   |   0
 .../graal/asm/amd64/AMD64MacroAssembler.java  |   0
 .../jdk/compiler/graal/asm/amd64/AVXKind.java |   0
 .../graal/bytecode/BridgeMethodUtils.java     |   0
 .../jdk/compiler/graal/bytecode/Bytecode.java |   0
 .../graal/bytecode/BytecodeDisassembler.java  |   0
 .../graal/bytecode/BytecodeLookupSwitch.java  |   0
 .../graal/bytecode/BytecodeProvider.java      |   0
 .../graal/bytecode/BytecodeStream.java        |   0
 .../graal/bytecode/BytecodeSwitch.java        |   0
 .../graal/bytecode/BytecodeTableSwitch.java   |   0
 .../compiler/graal/bytecode/Bytecodes.java    |   0
 .../jdk/compiler/graal/bytecode/Bytes.java    |   0
 .../jdk/compiler/graal/bytecode/OWNERS.toml   |   0
 .../bytecode/ResolvedJavaMethodBytecode.java  |   0
 .../ResolvedJavaMethodBytecodeProvider.java   |   0
 .../graal/code/CompilationResult.java         |   0
 .../jdk/compiler/graal/code/DataSection.java  |   0
 .../graal/code/DisassemblerProvider.java      |   0
 .../jdk/compiler/graal/code/HexCodeFile.java  |   0
 .../code/HexCodeFileDisassemblerProvider.java |   0
 .../code/ObjdumpDisassemblerProvider.java     |   0
 .../compiler/graal/code/SourceMapping.java    |   0
 .../SourceStackTraceBailoutException.java     |   0
 .../graal/core/CompilationPrinter.java        |   0
 .../graal/core/CompilationWatchDog.java       |   0
 .../graal/core/CompilationWrapper.java        |   0
 .../compiler/graal/core/CompilerThread.java   |   0
 .../graal/core/CompilerThreadFactory.java     |   0
 .../compiler/graal/core/GraalCompiler.java    |   0
 .../graal/core/GraalCompilerOptions.java      |   0
 .../graal/core/GraalServiceThread.java        |   0
 .../compiler/graal/core/Instrumentation.java  |   0
 .../graal/core/LIRGenerationPhase.java        |   0
 .../aarch64/AArch64AddressLoweringByUse.java  |   0
 .../core/aarch64/AArch64AddressNode.java      |   0
 .../AArch64ArithmeticLIRGenerator.java        |   0
 .../AArch64BarrierSetLIRGenerator.java        |   0
 .../core/aarch64/AArch64LIRGenerator.java     |   0
 .../core/aarch64/AArch64LIRKindTool.java      |   0
 .../aarch64/AArch64LoweringProviderMixin.java |   0
 .../core/aarch64/AArch64MoveFactory.java      |   0
 .../core/aarch64/AArch64NodeLIRBuilder.java   |   0
 .../core/aarch64/AArch64NodeMatchRules.java   |   0
 .../core/aarch64/AArch64PointerAddNode.java   |   0
 .../core/aarch64/AArch64SuitesCreator.java    |   0
 .../core/amd64/AMD64AddressLowering.java      |   0
 .../graal/core/amd64/AMD64AddressNode.java    |   0
 .../amd64/AMD64ArithmeticLIRGenerator.java    |   0
 .../amd64/AMD64BarrierSetLIRGenerator.java    |   0
 .../amd64/AMD64CompressAddressLowering.java   |   0
 .../graal/core/amd64/AMD64LIRGenerator.java   |   0
 .../graal/core/amd64/AMD64LIRKindTool.java    |   0
 .../amd64/AMD64LoweringProviderMixin.java     |   0
 .../graal/core/amd64/AMD64MoveFactory.java    |   0
 .../core/amd64/AMD64MoveFactoryBase.java      |   0
 .../graal/core/amd64/AMD64NodeLIRBuilder.java |   0
 .../graal/core/amd64/AMD64NodeMatchRules.java |   0
 .../graal/core/amd64/AMD64SuitesCreator.java  |   0
 .../graal/core/amd64/UseTrappingDivPhase.java |   0
 .../common/BootstrapMethodIntrospection.java  |   0
 .../common/CancellationBailoutException.java  |   0
 .../core/common/CompilationIdentifier.java    |   0
 .../common/CompilationListenerProfiler.java   |   0
 .../common/CompilationRequestIdentifier.java  |   0
 .../graal/core/common/CompilerProfiler.java   |   0
 .../graal/core/common/CompressEncoding.java   |   0
 .../graal/core/common/FieldIntrospection.java |   0
 .../compiler/graal/core/common/Fields.java    |   0
 .../graal/core/common/FieldsScanner.java      |   0
 .../core/common/GraalBailoutException.java    |   0
 .../graal/core/common/GraalOptions.java       |   0
 .../compiler/graal/core/common/LIRKind.java   |   0
 .../graal/core/common/LIRKindWithCast.java    |   0
 .../compiler/graal/core/common/NumUtil.java   |   0
 .../common/PermanentBailoutException.java     |   0
 .../common/RetryableBailoutException.java     |   0
 .../core/common/SpectrePHTMitigations.java    |   0
 .../compiler/graal/core/common/Stride.java    |   0
 .../graal/core/common/StrideUtil.java         |   0
 .../graal/core/common/SuppressFBWarnings.java |   0
 .../core/common/SuppressSVMWarnings.java      |   0
 .../common/alloc/BasicBlockOrderUtils.java    |   0
 .../alloc/DefaultCodeEmissionOrder.java       |   0
 .../core/common/alloc/LinearScanOrder.java    |   0
 .../alloc/RegisterAllocationConfig.java       |   0
 .../core/common/calc/CanonicalCondition.java  |   0
 .../graal/core/common/calc/Condition.java     |   0
 .../graal/core/common/calc/FloatConvert.java  |   0
 .../common/calc/FloatConvertCategory.java     |   0
 .../core/common/calc/ReinterpretUtils.java    |   0
 .../graal/core/common/calc/UnsignedMath.java  |   0
 .../common/cfg/AbstractControlFlowGraph.java  |   0
 .../graal/core/common/cfg/BasicBlock.java     |   0
 .../graal/core/common/cfg/BasicBlockSet.java  |   0
 .../graal/core/common/cfg/BlockMap.java       |   0
 .../graal/core/common/cfg/CFGVerifier.java    |   0
 .../core/common/cfg/CodeEmissionOrder.java    |   0
 .../cfg/DominatorOptimizationProblem.java     |   0
 .../compiler/graal/core/common/cfg/Loop.java  |   0
 .../core/common/cfg/PropertyConsumable.java   |   0
 ...itigateSpeculativeExecutionAttacksHelp.txt |   0
 .../common/doc-files/TraceInliningHelp.txt    |   0
 .../graal/core/common/memory/BarrierType.java |   0
 .../core/common/memory/MemoryExtendKind.java  |   0
 .../core/common/memory/MemoryOrderMode.java   |   0
 .../core/common/spi/CodeGenProviders.java     |   0
 .../common/spi/ConstantFieldProvider.java     |   0
 .../common/spi/ForeignCallDescriptor.java     |   0
 .../core/common/spi/ForeignCallLinkage.java   |   0
 .../core/common/spi/ForeignCallSignature.java |   0
 .../core/common/spi/ForeignCallsProvider.java |   0
 .../common/spi/JavaConstantFieldProvider.java |   0
 .../graal/core/common/spi/LIRKindTool.java    |   0
 .../spi/MetaAccessExtensionProvider.java      |   0
 .../core/common/type/AbstractObjectStamp.java |   0
 .../common/type/AbstractPointerStamp.java     |   0
 .../core/common/type/ArithmeticOpTable.java   |   0
 .../core/common/type/ArithmeticStamp.java     |   0
 .../common/type/CompressibleConstant.java     |   0
 .../core/common/type/DataPointerConstant.java |   0
 .../graal/core/common/type/FloatStamp.java    |   0
 .../graal/core/common/type/IllegalStamp.java  |   0
 .../graal/core/common/type/IntegerStamp.java  |   0
 .../graal/core/common/type/ObjectStamp.java   |   0
 .../core/common/type/PrimitiveStamp.java      |   0
 .../core/common/type/RawPointerStamp.java     |   0
 .../graal/core/common/type/Stamp.java         |   0
 .../graal/core/common/type/StampFactory.java  |   0
 .../graal/core/common/type/StampPair.java     |   0
 .../common/type/SymbolicJVMCIReference.java   |   0
 .../graal/core/common/type/TypeReference.java |   0
 .../graal/core/common/type/TypedConstant.java |   0
 .../graal/core/common/type/VoidStamp.java     |   0
 .../core/common/util/AbstractTypeReader.java  |   0
 .../graal/core/common/util/BitMap2D.java      |   0
 .../core/common/util/CompilationAlarm.java    |   0
 .../graal/core/common/util/EventCounter.java  |   0
 .../graal/core/common/util/FieldKey.java      |   0
 .../core/common/util/FrequencyEncoder.java    |   0
 .../graal/core/common/util/IntList.java       |   0
 .../graal/core/common/util/MethodKey.java     |   0
 .../graal/core/common/util/PhasePlan.java     |   0
 .../graal/core/common/util/ReversedList.java  |   0
 .../core/common/util/TypeConversion.java      |   0
 .../graal/core/common/util/TypeReader.java    |   0
 .../graal/core/common/util/TypeWriter.java    |   0
 .../common/util/UnsafeArrayTypeReader.java    |   0
 .../common/util/UnsafeArrayTypeWriter.java    |   0
 .../graal/core/common/util/UnsignedLong.java  |   0
 .../compiler/graal/core/common/util/Util.java |   0
 .../CompilationFailureActionHelp.txt          |   0
 .../graal/core/gen/BytecodeParserTool.java    |   0
 .../graal/core/gen/DebugInfoBuilder.java      |   0
 .../graal/core/gen/InstructionPrinter.java    |   0
 .../graal/core/gen/LIRCompilerBackend.java    |   0
 .../graal/core/gen/LIRGenerationProvider.java |   0
 .../graal/core/gen/NodeLIRBuilder.java        |   0
 .../graal/core/gen/NodeMatchRules.java        |   0
 .../compiler/graal/core/gen/package-info.java |   0
 .../graal/core/match/ComplexMatchResult.java  |   0
 .../graal/core/match/ComplexMatchValue.java   |   0
 .../graal/core/match/MatchContext.java        |   0
 .../graal/core/match/MatchGenerator.java      |   0
 .../graal/core/match/MatchPattern.java        |   0
 .../compiler/graal/core/match/MatchRule.java  |   0
 .../graal/core/match/MatchRuleRegistry.java   |   0
 .../compiler/graal/core/match/MatchRules.java |   0
 .../graal/core/match/MatchStatement.java      |   0
 .../graal/core/match/MatchStatementSet.java   |   0
 .../graal/core/match/MatchableNode.java       |   0
 .../graal/core/match/MatchableNodes.java      |   0
 .../jdk/compiler/graal/core/package-info.java |   0
 .../compiler/graal/core/phases/BaseTier.java  |   0
 .../graal/core/phases/CEOptimization.java     |   0
 .../CommunityCompilerConfiguration.java       |   0
 .../phases/EconomyCompilerConfiguration.java  |   0
 .../graal/core/phases/EconomyHighTier.java    |   0
 .../graal/core/phases/EconomyLowTier.java     |   0
 .../graal/core/phases/EconomyMidTier.java     |   0
 .../compiler/graal/core/phases/HighTier.java  |   0
 .../compiler/graal/core/phases/LowTier.java   |   0
 .../compiler/graal/core/phases/MidTier.java   |   0
 .../fuzzing/AbstractCompilationPlan.java      |   0
 .../core/phases/fuzzing/AbstractTierPlan.java |   0
 .../fuzzing/FullFuzzedCompilationPlan.java    |   0
 .../phases/fuzzing/FullFuzzedTierPlan.java    |   0
 .../core/phases/fuzzing/FuzzedSuites.java     |   0
 .../fuzzing/MinimalFuzzedCompilationPlan.java |   0
 .../phases/fuzzing/MinimalFuzzedTierPlan.java |   0
 .../phases/fuzzing/PhasePlanSerializer.java   |   0
 .../riscv64/RISCV64LoweringProviderMixin.java |   0
 .../core/riscv64/RISCV64NodeMatchRules.java   |   0
 .../core/riscv64/RISCV64ReflectionUtil.java   |   0
 .../graal/core/riscv64/ShadowedRISCV64.java   |   0
 .../compiler/graal/core/target/Backend.java   |   0
 .../jdk/compiler/graal/debug/AbstractKey.java |   0
 .../compiler/graal/debug/AccumulatedKey.java  |   0
 .../jdk/compiler/graal/debug/Assertions.java  |   0
 .../src/jdk/compiler/graal/debug/CSVUtil.java |   0
 .../graal/debug/CausableByCompilerAssert.java |   0
 .../graal/debug/CloseableCounter.java         |   0
 .../graal/debug/CompilationListener.java      |   0
 .../jdk/compiler/graal/debug/CounterKey.java  |   0
 .../compiler/graal/debug/CounterKeyImpl.java  |   0
 .../compiler/graal/debug/DebugCloseable.java  |   0
 .../jdk/compiler/graal/debug/DebugConfig.java |   0
 .../compiler/graal/debug/DebugConfigImpl.java |   0
 .../compiler/graal/debug/DebugContext.java    |   0
 .../graal/debug/DebugDumpHandler.java         |   0
 .../compiler/graal/debug/DebugDumpScope.java  |   0
 .../jdk/compiler/graal/debug/DebugFilter.java |   0
 .../compiler/graal/debug/DebugHandler.java    |   0
 .../graal/debug/DebugHandlersFactory.java     |   0
 .../compiler/graal/debug/DebugOptions.java    |   0
 .../graal/debug/DebugVerifyHandler.java       |   0
 .../debug/DiagnosticsOutputDirectory.java     |   0
 .../compiler/graal/debug/GlobalMetrics.java   |   0
 .../jdk/compiler/graal/debug/GraalError.java  |   0
 .../compiler/graal/debug/IgvDumpChannel.java  |   0
 .../src/jdk/compiler/graal/debug/Indent.java  |   0
 .../graal/debug/JavaMethodContext.java        |   0
 .../jdk/compiler/graal/debug/KeyRegistry.java |   0
 .../jdk/compiler/graal/debug/LogStream.java   |   0
 .../graal/debug/MemUseTrackerKey.java         |   0
 .../graal/debug/MemUseTrackerKeyImpl.java     |   0
 .../compiler/graal/debug/MethodFilter.java    |   0
 .../jdk/compiler/graal/debug/MetricKey.java   |   0
 .../compiler/graal/debug/PathUtilities.java   |   0
 .../graal/debug/PathUtilitiesProvider.java    |   0
 .../jdk/compiler/graal/debug/ScopeImpl.java   |   0
 .../debug/StandardPathUtilitiesProvider.java  |   0
 .../src/jdk/compiler/graal/debug/TTY.java     |   0
 .../graal/debug/TTYStreamProvider.java        |   0
 .../jdk/compiler/graal/debug/TimeSource.java  |   0
 .../jdk/compiler/graal/debug/TimerKey.java    |   0
 .../compiler/graal/debug/TimerKeyImpl.java    |   0
 .../jdk/compiler/graal/debug/Versions.java    |   0
 .../graal/debug/doc-files/DumpHelp.txt        |   0
 .../debug/doc-files/MethodFilterHelp.txt      |   0
 .../graal/debug/doc-files/MetricsFileHelp.txt |   0
 .../debug/doc-files/OptimizationLogHelp.txt   |   0
 .../graal/debug/doc-files/PrintGraphHelp.txt  |   0
 .../src/jdk/compiler/graal/graph/Edges.java   |   0
 .../compiler/graal/graph/GraalGraphError.java |   0
 .../src/jdk/compiler/graal/graph/Graph.java   |   0
 .../graal/graph/GraphNodeIterator.java        |   0
 .../jdk/compiler/graal/graph/InputEdges.java  |   0
 .../graal/graph/IterableNodeType.java         |   0
 .../jdk/compiler/graal/graph/LinkedStack.java |   0
 .../graal/graph/MemoryKillMarker.java         |   0
 .../src/jdk/compiler/graal/graph/Node.java    |   0
 .../jdk/compiler/graal/graph/NodeBitMap.java  |   0
 .../jdk/compiler/graal/graph/NodeClass.java   |   0
 .../jdk/compiler/graal/graph/NodeFlood.java   |   0
 .../compiler/graal/graph/NodeIdAccessor.java  |   0
 .../compiler/graal/graph/NodeInputList.java   |   0
 .../jdk/compiler/graal/graph/NodeList.java    |   0
 .../src/jdk/compiler/graal/graph/NodeMap.java |   0
 .../graal/graph/NodeSourcePosition.java       |   0
 .../jdk/compiler/graal/graph/NodeStack.java   |   0
 .../graal/graph/NodeSuccessorList.java        |   0
 .../compiler/graal/graph/NodeUnionFind.java   |   0
 .../graal/graph/NodeUsageIterable.java        |   0
 .../graal/graph/NodeUsageIterator.java        |   0
 .../graph/NodeUsageWithModCountIterator.java  |   0
 .../compiler/graal/graph/NodeWorkList.java    |   0
 .../jdk/compiler/graal/graph/Position.java    |   0
 .../graal/graph/SourceLanguagePosition.java   |   0
 .../graph/SourceLanguagePositionProvider.java |   0
 .../compiler/graal/graph/SuccessorEdges.java  |   0
 .../graal/graph/TypedGraphNodeIterator.java   |   0
 .../graph/iterators/FilteredNodeIterable.java |   0
 .../graal/graph/iterators/NodeIterable.java   |   0
 .../graal/graph/iterators/NodeIterator.java   |   0
 .../graal/graph/iterators/NodePredicate.java  |   0
 .../graal/graph/iterators/NodePredicates.java |   0
 .../PredicatedProxyNodeIterator.java          |   0
 .../compiler/graal/graph/package-info.java    |   0
 .../graph/spi/BinaryCommutativeMarker.java    |   0
 .../graph/spi/CanonicalizableMarker.java      |   0
 .../graal/graph/spi/NodeWithIdentity.java     |   0
 .../graal/graph/spi/SimplifiableMarker.java   |   0
 .../graal/graphio/DefaultGraphBlocks.java     |   0
 .../graal/graphio/DefaultGraphTypes.java      |   0
 .../compiler/graal/graphio/GraphBlocks.java   |   0
 .../compiler/graal/graphio/GraphElements.java |   0
 .../graal/graphio/GraphJavadocSnippets.java   |   0
 .../graal/graphio/GraphLocations.java         |   0
 .../compiler/graal/graphio/GraphOutput.java   |   0
 .../compiler/graal/graphio/GraphProtocol.java |   0
 .../graal/graphio/GraphStructure.java         |   0
 .../compiler/graal/graphio/GraphTypes.java    |   0
 .../compiler/graal/graphio/ProtocolImpl.java  |   0
 .../graal/graphio/doc-files/diamond.png       | Bin
 .../compiler/graal/graphio/package-info.java  |   0
 .../graal/hightiercodegen/CodeBuffer.java     |   0
 .../graal/hightiercodegen/CodeGenTool.java    |   0
 .../graal/hightiercodegen/Emitter.java        |   0
 .../graal/hightiercodegen/IEmitter.java       |   0
 .../graal/hightiercodegen/Keyword.java        |   0
 .../graal/hightiercodegen/NodeLowerer.java    |   0
 .../irwalk/BasicBlockInterpreter.java         |   0
 .../irwalk/BlockNestingVerifier.java          |   0
 .../irwalk/BlockVisitHistory.java             |   0
 .../irwalk/IRWalkVerifier.java                |   0
 .../hightiercodegen/irwalk/IRWalker.java      |   0
 .../irwalk/StackifierIRWalker.java            |   0
 .../lowerer/CommitAllocationLowerer.java      |   0
 .../hightiercodegen/lowerer/MoveResolver.java |   0
 .../lowerer/PhiResolveLowerer.java            |   0
 .../reconstruction/ReconstructionData.java    |   0
 .../reconstruction/ReconstructionPhase.java   |   0
 .../ScheduleWithReconstructionResult.java     |   0
 .../reconstruction/StackifierData.java        |   0
 .../stackifier/CFStackifierSortPhase.java     |   0
 .../StackifierReconstructionPhase.java        |   0
 .../StackifierScopeComputation.java           |   0
 .../stackifier/blocks/LabeledBlock.java       |   0
 .../blocks/LabeledBlockGeneration.java        |   0
 .../scopes/CatchScopeContainer.java           |   0
 .../stackifier/scopes/IfScopeContainer.java   |   0
 .../stackifier/scopes/LoopScopeContainer.java |   0
 .../stackifier/scopes/Scope.java              |   0
 .../stackifier/scopes/ScopeContainer.java     |   0
 .../scopes/SwitchScopeContainer.java          |   0
 .../variables/ResolvedVar.java                |   0
 .../variables/VariableAllocation.java         |   0
 .../variables/VariableMap.java                |   0
 .../graal/hotspot/BootstrapWatchDog.java      |   0
 ...CommunityCompilerConfigurationFactory.java |   0
 .../graal/hotspot/CompilationContext.java     |   0
 .../graal/hotspot/CompilationCounters.java    |   0
 .../graal/hotspot/CompilationStatistics.java  |   0
 .../graal/hotspot/CompilationTask.java        |   0
 ...leTheWorldFuzzedSuitesCompilationTask.java |   0
 .../hotspot/CompilerConfigurationFactory.java |   0
 .../graal/hotspot/DefaultInstrumentation.java |   0
 .../EconomyCompilerConfigurationFactory.java  |   0
 .../graal/hotspot/EncodedSnippets.java        |   0
 .../graal/hotspot/GraalHotSpotVMConfig.java   |   0
 .../hotspot/GraalHotSpotVMConfigAccess.java   |   0
 .../graal/hotspot/HotSpotBackend.java         |   0
 .../graal/hotspot/HotSpotBackendFactory.java  |   0
 .../graal/hotspot/HotSpotBytecodeParser.java  |   0
 .../hotspot/HotSpotCodeCacheListener.java     |   0
 .../hotspot/HotSpotCompilationIdentifier.java |   0
 .../hotspot/HotSpotCompiledCodeBuilder.java   |   0
 .../graal/hotspot/HotSpotCounterOp.java       |   0
 .../graal/hotspot/HotSpotDataBuilder.java     |   0
 .../hotspot/HotSpotDebugInfoBuilder.java      |   0
 .../hotspot/HotSpotForeignCallLinkage.java    |   0
 .../HotSpotForeignCallLinkageImpl.java        |   0
 .../graal/hotspot/HotSpotGraalCompiler.java   |   0
 .../hotspot/HotSpotGraalCompilerFactory.java  |   0
 .../HotSpotGraalJVMCIServiceLocator.java      |   0
 .../hotspot/HotSpotGraalOptionValues.java     |   0
 .../graal/hotspot/HotSpotGraalRuntime.java    |   0
 .../hotspot/HotSpotGraalRuntimeProvider.java  |   0
 .../graal/hotspot/HotSpotGraalServices.java   |   0
 .../hotspot/HotSpotGraalVMEventListener.java  |   0
 .../hotspot/HotSpotGraphBuilderInstance.java  |   0
 .../hotspot/HotSpotGraphBuilderPhase.java     |   0
 .../graal/hotspot/HotSpotHostBackend.java     |   0
 .../hotspot/HotSpotLIRGenerationResult.java   |   0
 .../graal/hotspot/HotSpotLIRGenerator.java    |   0
 .../graal/hotspot/HotSpotLockStack.java       |   0
 .../compiler/graal/hotspot/HotSpotMarkId.java |   0
 .../graal/hotspot/HotSpotNodeLIRBuilder.java  |   0
 .../hotspot/HotSpotReferenceMapBuilder.java   |   0
 .../hotspot/HotSpotReplacementsImpl.java      |   0
 .../HotSpotSnippetMetaAccessProvider.java     |   0
 .../hotspot/HotSpotTTYStreamProvider.java     |   0
 .../graal/hotspot/HotSpotZBarrierSet.java     |   0
 .../graal/hotspot/IsGraalPredicate.java       |   0
 .../graal/hotspot/IsGraalPredicateBase.java   |   0
 .../graal/hotspot/JFRCompilerProfiler.java    |   0
 .../graal/hotspot/JVMCICompilerShadow.java    |   0
 .../graal/hotspot/JVMCIVersionCheck.java      |   0
 .../graal/hotspot/JVMCIVersionCompare.java    |   0
 .../graal/hotspot/ProfileReplaySupport.java   |   0
 .../graal/hotspot/SnippetObjectConstant.java  |   0
 .../hotspot/SnippetResolvedJavaMethod.java    |   0
 .../hotspot/SnippetResolvedJavaType.java      |   0
 .../graal/hotspot/SnippetSignature.java       |   0
 .../graal/hotspot/SymbolicSnippetEncoder.java |   0
 .../aarch64/AArch64HotSpotBackend.java        |   0
 .../aarch64/AArch64HotSpotBackendFactory.java |   0
 .../AArch64HotSpotCRuntimeCallEpilogueOp.java |   0
 .../AArch64HotSpotCRuntimeCallPrologueOp.java |   0
 .../aarch64/AArch64HotSpotCounterOp.java      |   0
 .../AArch64HotSpotDeoptimizeCallerOp.java     |   0
 .../aarch64/AArch64HotSpotDeoptimizeOp.java   |   0
 ...otSpotDeoptimizeWithExceptionCallerOp.java |   0
 .../AArch64HotSpotDirectStaticCallOp.java     |   0
 .../AArch64HotSpotDirectVirtualCallOp.java    |   0
 .../aarch64/AArch64HotSpotEpilogueOp.java     |   0
 .../AArch64HotSpotForeignCallsProvider.java   |   0
 ...tSpotJumpToExceptionHandlerInCallerOp.java |   0
 .../aarch64/AArch64HotSpotLIRGenerator.java   |   0
 .../AArch64HotSpotLoweringProvider.java       |   0
 .../aarch64/AArch64HotSpotMacroAssembler.java |   0
 .../hotspot/aarch64/AArch64HotSpotMove.java   |   0
 .../aarch64/AArch64HotSpotMoveFactory.java    |   0
 .../aarch64/AArch64HotSpotNodeLIRBuilder.java |   0
 .../AArch64HotSpotPatchReturnAddressOp.java   |   0
 ...Arch64HotSpotRegisterAllocationConfig.java |   0
 .../aarch64/AArch64HotSpotReturnOp.java       |   0
 .../aarch64/AArch64HotSpotSafepointOp.java    |   0
 .../AArch64HotSpotStrategySwitchOp.java       |   0
 .../aarch64/AArch64HotSpotSuitesCreator.java  |   0
 .../aarch64/AArch64HotSpotUnwindOp.java       |   0
 .../AArch64HotSpotZAtomicReadAndWriteOp.java  |   0
 ...AArch64HotSpotZBarrierSetLIRGenerator.java |   0
 .../aarch64/AArch64HotSpotZBarrieredOp.java   |   0
 .../AArch64HotSpotZCompareAndSwapOp.java      |   0
 .../aarch64/AArch64HotSpotZReadBarrierOp.java |   0
 .../aarch64/AArch64IndirectCallOp.java        |   0
 .../hotspot/amd64/AMD64DeoptimizeOp.java      |   0
 .../amd64/AMD64HotSpotAddressLowering.java    |   0
 .../hotspot/amd64/AMD64HotSpotBackend.java    |   0
 .../amd64/AMD64HotSpotBackendFactory.java     |   0
 .../AMD64HotSpotCRuntimeCallEpilogueOp.java   |   0
 .../AMD64HotSpotCRuntimeCallPrologueOp.java   |   0
 .../hotspot/amd64/AMD64HotSpotCounterOp.java  |   0
 .../amd64/AMD64HotSpotDeoptimizeCallerOp.java |   0
 ...otSpotDeoptimizeWithExceptionCallerOp.java |   0
 .../amd64/AMD64HotSpotDirectStaticCallOp.java |   0
 .../amd64/AMD64HotSpotEpilogueBlockEndOp.java |   0
 .../AMD64HotSpotForeignCallsProvider.java     |   0
 .../hotspot/amd64/AMD64HotSpotFrameMap.java   |   0
 .../amd64/AMD64HotSpotFrameMapBuilder.java    |   0
 .../amd64/AMD64HotSpotIndirectCallOp.java     |   0
 ...tSpotJumpToExceptionHandlerInCallerOp.java |   0
 .../amd64/AMD64HotSpotLIRGenerator.java       |   0
 .../amd64/AMD64HotSpotLIRKindTool.java        |   0
 .../amd64/AMD64HotSpotLoweringProvider.java   |   0
 .../amd64/AMD64HotSpotMacroAssembler.java     |   0
 .../amd64/AMD64HotSpotMathIntrinsicOp.java    |   0
 .../graal/hotspot/amd64/AMD64HotSpotMove.java |   0
 .../amd64/AMD64HotSpotMoveFactory.java        |   0
 .../amd64/AMD64HotSpotNodeLIRBuilder.java     |   0
 .../AMD64HotSpotPatchReturnAddressOp.java     |   0
 .../AMD64HotSpotPushInterpreterFrameOp.java   |   0
 .../AMD64HotSpotRegisterAllocationConfig.java |   0
 .../amd64/AMD64HotSpotRestoreRbpOp.java       |   0
 .../hotspot/amd64/AMD64HotSpotReturnOp.java   |   0
 .../amd64/AMD64HotSpotSafepointOp.java        |   0
 .../amd64/AMD64HotSpotStrategySwitchOp.java   |   0
 .../amd64/AMD64HotSpotSuitesCreator.java      |   0
 .../hotspot/amd64/AMD64HotSpotUnwindOp.java   |   0
 .../AMD64HotSpotZAtomicReadAndWriteOp.java    |   0
 .../AMD64HotSpotZBarrierSetLIRGenerator.java  |   0
 .../amd64/AMD64HotSpotZBarrieredOp.java       |   0
 .../amd64/AMD64HotSpotZCompareAndSwapOp.java  |   0
 .../amd64/AMD64HotSpotZReadBarrierOp.java     |   0
 .../AMD64HotSpotZVectorReadBarrierOp.java     |   0
 .../AMD64HotspotDirectVirtualCallOp.java      |   0
 .../graal/hotspot/amd64/AMD64MathStub.java    |   0
 .../graal/hotspot/amd64/AMD64TailcallOp.java  |   0
 .../amd64/AMD64X87MathIntrinsicNode.java      |   0
 .../hotspot/amd64/AMD64X87MathSnippets.java   |   0
 .../hotspot/debug/BenchmarkCounters.java      |   0
 .../AbortOnBenchmarkCounterOverflowHelp.txt   |   0
 .../BenchmarkDynamicCountersHelp.txt          |   0
 .../hotspot/lir/HotSpotZapRegistersPhase.java |   0
 .../lir/VerifyMaxRegisterSizePhase.java       |   0
 .../AddressLoweringHotSpotSuitesProvider.java |   0
 .../meta/DefaultHotSpotLoweringProvider.java  |   0
 .../meta/HotSpotConstantFieldProvider.java    |   0
 .../meta/HotSpotDisassemblerProvider.java     |   0
 .../meta/HotSpotExceptionDispatchPlugin.java  |   0
 .../meta/HotSpotForeignCallDescriptor.java    |   0
 .../meta/HotSpotForeignCallsProvider.java     |   0
 .../meta/HotSpotForeignCallsProviderImpl.java |   0
 .../meta/HotSpotFuzzedSuitesProvider.java     |   0
 .../HotSpotGraalConstantFieldProvider.java    |   0
 .../meta/HotSpotGraphBuilderPlugins.java      |   0
 .../meta/HotSpotHostForeignCallsProvider.java |   0
 .../meta/HotSpotInvocationPluginProvider.java |   0
 .../meta/HotSpotInvocationPlugins.java        |   0
 .../HotSpotJITClassInitializationPlugin.java  |   0
 .../meta/HotSpotLoadedSuitesProvider.java     |   0
 .../hotspot/meta/HotSpotLoweringProvider.java |   0
 .../HotSpotMetaAccessExtensionProvider.java   |   0
 .../graal/hotspot/meta/HotSpotNodePlugin.java |   0
 .../HotSpotPlatformConfigurationProvider.java |   0
 .../graal/hotspot/meta/HotSpotProviders.java  |   0
 .../graal/hotspot/meta/HotSpotRegisters.java  |   0
 .../meta/HotSpotRegistersProvider.java        |   0
 .../HotSpotSnippetReflectionProvider.java     |   0
 .../hotspot/meta/HotSpotStampProvider.java    |   0
 .../hotspot/meta/HotSpotSuitesProvider.java   |   0
 .../meta/HotSpotWordOperationPlugin.java      |   0
 .../meta/UnimplementedGraalIntrinsics.java    |   0
 .../hotspot/nodes/AcquiredCASLockNode.java    |   0
 .../graal/hotspot/nodes/AllocaNode.java       |   0
 .../hotspot/nodes/BeginLockScopeNode.java     |   0
 .../hotspot/nodes/CurrentJavaThreadNode.java  |   0
 .../graal/hotspot/nodes/CurrentLockNode.java  |   0
 .../hotspot/nodes/DeoptimizeCallerNode.java   |   0
 .../DeoptimizeWithExceptionInCallerNode.java  |   0
 .../hotspot/nodes/DeoptimizingStubCall.java   |   0
 .../graal/hotspot/nodes/EndLockScopeNode.java |   0
 .../nodes/FastAcquireBiasedLockNode.java      |   0
 .../hotspot/nodes/HotSpotCompressionNode.java |   0
 .../nodes/HotSpotDirectCallTargetNode.java    |   0
 .../nodes/HotSpotIndirectCallTargetNode.java  |   0
 .../HotSpotLoadReservedReferenceNode.java     |   0
 .../HotSpotStoreReservedReferenceNode.java    |   0
 .../JumpToExceptionHandlerInCallerNode.java   |   0
 .../nodes/JumpToExceptionHandlerNode.java     |   0
 .../nodes/KlassBeingInitializedCheckNode.java |   0
 .../hotspot/nodes/LoadIndexedPointerNode.java |   0
 .../hotspot/nodes/MonitorCounterNode.java     |   0
 .../hotspot/nodes/PatchReturnAddressNode.java |   0
 .../hotspot/nodes/StubForeignCallNode.java    |   0
 .../graal/hotspot/nodes/StubStartNode.java    |   0
 .../graal/hotspot/nodes/VMErrorNode.java      |   0
 .../nodes/VirtualThreadUpdateJFRNode.java     |   0
 .../nodes/type/HotSpotNarrowOopStamp.java     |   0
 .../hotspot/nodes/type/KlassPointerStamp.java |   0
 .../nodes/type/MetaspacePointerStamp.java     |   0
 .../type/MethodCountersPointerStamp.java      |   0
 .../nodes/type/MethodPointerStamp.java        |   0
 .../compiler/graal/hotspot/package-info.java  |   0
 .../phases/OnStackReplacementPhase.java       |   0
 .../replacements/AssertionSnippets.java       |   0
 .../replacements/CallSiteTargetNode.java      |   0
 .../hotspot/replacements/ClassGetHubNode.java |   0
 .../replacements/DigestBaseSnippets.java      |   0
 .../hotspot/replacements/FastNotifyNode.java  |   0
 .../HotSpotAllocationSnippets.java            |   0
 .../HotSpotG1WriteBarrierSnippets.java        |   0
 .../replacements/HotSpotHashCodeSnippets.java |   0
 .../HotSpotIdentityHashCodeNode.java          |   0
 .../HotSpotInvocationPluginHelper.java        |   0
 .../replacements/HotSpotIsArraySnippets.java  |   0
 .../HotSpotReflectionGetCallerClassNode.java  |   0
 .../replacements/HotSpotReplacementsUtil.java |   0
 .../HotSpotSerialWriteBarrierSnippets.java    |   0
 .../replacements/HotspotSnippetsOptions.java  |   0
 .../hotspot/replacements/HubGetClassNode.java |   0
 .../replacements/InstanceOfSnippets.java      |   0
 .../replacements/KlassLayoutHelperNode.java   |   0
 .../LoadExceptionObjectSnippets.java          |   0
 .../graal/hotspot/replacements/Log.java       |   0
 .../hotspot/replacements/LogSnippets.java     |   0
 .../hotspot/replacements/MonitorSnippets.java |   0
 .../hotspot/replacements/ObjectCloneNode.java |   0
 .../replacements/ObjectCloneSnippets.java     |   0
 .../hotspot/replacements/ObjectSnippets.java  |   0
 .../RegisterFinalizerSnippets.java            |   0
 .../replacements/StringToBytesSnippets.java   |   0
 .../replacements/TypeCheckSnippetUtils.java   |   0
 .../replacements/UnsafeCopyMemoryNode.java    |   0
 .../hotspot/replacements/UnsafeSnippets.java  |   0
 .../VirtualThreadUpdateJFRSnippets.java       |   0
 .../arraycopy/CheckcastArrayCopyCallNode.java |   0
 .../arraycopy/GenericArrayCopyCallNode.java   |   0
 .../arraycopy/HotSpotArraycopySnippets.java   |   0
 .../ProfileAllocationsContextHelp.txt         |   0
 .../riscv64/RISCV64HotSpotBackendFactory.java |   0
 .../RISCV64HotSpotForeignCallsProvider.java   |   0
 .../RISCV64HotSpotLoweringProvider.java       |   0
 .../riscv64/RISCV64HotSpotSuitesCreator.java  |   0
 .../stubs/AbstractForeignCallStub.java        |   0
 .../stubs/ArrayStoreExceptionStub.java        |   0
 .../hotspot/stubs/ClassCastExceptionStub.java |   0
 .../hotspot/stubs/CreateExceptionStub.java    |   0
 .../stubs/DivisionByZeroExceptionStub.java    |   0
 .../hotspot/stubs/ExceptionHandlerStub.java   |   0
 .../hotspot/stubs/ForeignCallSnippets.java    |   0
 .../graal/hotspot/stubs/ForeignCallStub.java  |   0
 .../graal/hotspot/stubs/HotSpotGraphKit.java  |   0
 ...mentExceptionArgumentIsNotAnArrayStub.java |   0
 .../IntegerExactOverflowExceptionStub.java    |   0
 .../graal/hotspot/stubs/IntrinsicStubs.java   |   0
 .../hotspot/stubs/InvokeJavaMethodStub.java   |   0
 .../stubs/LongExactOverflowExceptionStub.java |   0
 .../stubs/NegativeArraySizeExceptionStub.java |   0
 .../stubs/NullPointerExceptionStub.java       |   0
 .../stubs/OutOfBoundsExceptionStub.java       |   0
 .../graal/hotspot/stubs/SnippetStub.java      |   0
 .../compiler/graal/hotspot/stubs/Stub.java    |   0
 .../stubs/StubCompilationIdentifier.java      |   0
 .../graal/hotspot/stubs/StubOptions.java      |   0
 .../graal/hotspot/stubs/StubUtil.java         |   0
 .../stubs/UnwindExceptionToCallerStub.java    |   0
 .../graal/hotspot/stubs/VerifyOopStub.java    |   0
 .../graal/hotspot/word/HotSpotOperation.java  |   0
 .../graal/hotspot/word/HotSpotWordTypes.java  |   0
 .../graal/hotspot/word/KlassPointer.java      |   0
 .../graal/hotspot/word/MetaspacePointer.java  |   0
 .../hotspot/word/MethodCountersPointer.java   |   0
 .../graal/hotspot/word/MethodPointer.java     |   0
 .../graal/hotspot/word/PointerCastNode.java   |   0
 .../compiler/graal/java/BciBlockMapping.java  |   0
 .../compiler/graal/java/BytecodeParser.java   |   0
 .../graal/java/BytecodeParserOptions.java     |   0
 .../graal/java/DefaultSuitesCreator.java      |   0
 .../graal/java/FrameStateBuilder.java         |   0
 .../graal/java/GraphBuilderPhase.java         |   0
 .../graal/java/JsrNotSupportedBailout.java    |   0
 .../src/jdk/compiler/graal/java/JsrScope.java |   0
 .../jdk/compiler/graal/java/LambdaUtils.java  |   0
 .../graal/java/LargeLocalLiveness.java        |   0
 .../compiler/graal/java/LocalLiveness.java    |   0
 .../graal/java/SmallLocalLiveness.java        |   0
 .../graal/java/StableMethodNameFormatter.java |   0
 .../graal/java/SuitesProviderBase.java        |   0
 .../BailoutAndRestartBackendException.java    |   0
 .../src/jdk/compiler/graal/lir/CastValue.java |   0
 .../compiler/graal/lir/CompositeValue.java    |   0
 .../graal/lir/CompositeValueClass.java        |   0
 .../graal/lir/ComputeCodeEmissionOrder.java   |   0
 .../jdk/compiler/graal/lir/ConstantValue.java |   0
 .../graal/lir/ControlFlowOptimizer.java       |   0
 .../compiler/graal/lir/EdgeMoveOptimizer.java |   0
 .../compiler/graal/lir/FullInfopointOp.java   |   0
 .../jdk/compiler/graal/lir/GenerateStub.java  |   0
 .../jdk/compiler/graal/lir/GenerateStubs.java |   0
 .../graal/lir/GeneratedStubsHolder.java       |   0
 .../graal/lir/ImplicitLIRFrameState.java      |   0
 .../graal/lir/InstructionStateProcedure.java  |   0
 .../graal/lir/InstructionValueConsumer.java   |   0
 .../graal/lir/InstructionValueProcedure.java  |   0
 .../src/jdk/compiler/graal/lir/LIR.java       |   0
 .../jdk/compiler/graal/lir/LIRFrameState.java |   0
 .../graal/lir/LIRInsertionBuffer.java         |   0
 .../compiler/graal/lir/LIRInstruction.java    |   0
 .../graal/lir/LIRInstructionClass.java        |   0
 .../graal/lir/LIRInstructionVerifier.java     |   0
 .../compiler/graal/lir/LIRIntrospection.java  |   0
 .../jdk/compiler/graal/lir/LIRValueUtil.java  |   0
 .../src/jdk/compiler/graal/lir/LabelRef.java  |   0
 .../graal/lir/NullCheckOptimizer.java         |   0
 .../src/jdk/compiler/graal/lir/Opcode.java    |   0
 .../graal/lir/RedundantMoveElimination.java   |   0
 .../jdk/compiler/graal/lir/StandardOp.java    |   0
 .../compiler/graal/lir/StateProcedure.java    |   0
 .../compiler/graal/lir/SwitchStrategy.java    |   0
 .../src/jdk/compiler/graal/lir/SyncPort.java  |   0
 .../src/jdk/compiler/graal/lir/SyncPorts.java |   0
 .../jdk/compiler/graal/lir/ValueConsumer.java |   0
 .../compiler/graal/lir/ValueProcedure.java    |   0
 .../src/jdk/compiler/graal/lir/Variable.java  |   0
 .../compiler/graal/lir/VirtualStackSlot.java  |   0
 .../lir/aarch64/AArch64AESDecryptOp.java      |   0
 .../lir/aarch64/AArch64AESEncryptOp.java      |   0
 .../lir/aarch64/AArch64AcrossVectorOp.java    |   0
 .../lir/aarch64/AArch64AddressValue.java      |   0
 .../lir/aarch64/AArch64ArithmeticOp.java      |   0
 .../lir/aarch64/AArch64ArrayCompareToOp.java  |   0
 .../AArch64ArrayCopyWithConversionsOp.java    |   0
 .../lir/aarch64/AArch64ArrayEqualsOp.java     |   0
 .../lir/aarch64/AArch64ArrayIndexOfOp.java    |   0
 .../AArch64ArrayRegionCompareToOp.java        |   0
 .../graal/lir/aarch64/AArch64AtomicMove.java  |   0
 .../aarch64/AArch64BigIntegerMulAddOp.java    |   0
 .../AArch64BigIntegerMultiplyToLenOp.java     |   0
 .../AArch64BigIntegerSquareToLenOp.java       |   0
 .../graal/lir/aarch64/AArch64BitFieldOp.java  |   0
 .../lir/aarch64/AArch64BitManipulationOp.java |   0
 .../graal/lir/aarch64/AArch64BitSwapOp.java   |   0
 .../graal/lir/aarch64/AArch64BlockEndOp.java  |   0
 .../lir/aarch64/AArch64BreakpointOp.java      |   0
 .../graal/lir/aarch64/AArch64ByteSwap.java    |   0
 .../lir/aarch64/AArch64CacheWritebackOp.java  |   0
 .../AArch64CacheWritebackPostSyncOp.java      |   0
 .../AArch64CalcStringAttributesOp.java        |   0
 .../graal/lir/aarch64/AArch64Call.java        |   0
 ...Arch64CipherBlockChainingAESDecryptOp.java |   0
 ...Arch64CipherBlockChainingAESEncryptOp.java |   0
 .../graal/lir/aarch64/AArch64Compare.java     |   0
 .../lir/aarch64/AArch64ComplexVectorOp.java   |   0
 .../graal/lir/aarch64/AArch64ControlFlow.java |   0
 .../graal/lir/aarch64/AArch64Convert.java     |   0
 .../lir/aarch64/AArch64CountPositivesOp.java  |   0
 .../aarch64/AArch64CounterModeAESCryptOp.java |   0
 .../lir/aarch64/AArch64EncodeArrayOp.java     |   0
 .../aarch64/AArch64FloatToHalfFloatOp.java    |   0
 .../graal/lir/aarch64/AArch64FrameMap.java    |   0
 .../lir/aarch64/AArch64FrameMapBuilder.java   |   0
 .../aarch64/AArch64GHASHProcessBlocksOp.java  |   0
 .../aarch64/AArch64HalfFloatToFloatOp.java    |   0
 .../graal/lir/aarch64/AArch64HaltOp.java      |   0
 .../graal/lir/aarch64/AArch64LIRFlags.java    |   0
 .../lir/aarch64/AArch64LIRInstruction.java    |   0
 .../graal/lir/aarch64/AArch64MD5Op.java       |   0
 .../lir/aarch64/AArch64MathCopySignOp.java    |   0
 .../aarch64/AArch64MathIntrinsicBinaryOp.java |   0
 .../lir/aarch64/AArch64MathSignumOp.java      |   0
 .../graal/lir/aarch64/AArch64Move.java        |   0
 .../AArch64NormalizedUnsignedCompareOp.java   |   0
 .../graal/lir/aarch64/AArch64PauseOp.java     |   0
 .../graal/lir/aarch64/AArch64PermuteOp.java   |   0
 .../graal/lir/aarch64/AArch64PrefetchOp.java  |   0
 .../aarch64/AArch64ReadTimestampCounter.java  |   0
 .../lir/aarch64/AArch64ReinterpretOp.java     |   0
 .../aarch64/AArch64RestoreRegistersOp.java    |   0
 .../aarch64/AArch64RoundFloatToIntegerOp.java |   0
 .../graal/lir/aarch64/AArch64SHA1Op.java      |   0
 .../graal/lir/aarch64/AArch64SHA256Op.java    |   0
 .../graal/lir/aarch64/AArch64SHA3Op.java      |   0
 .../graal/lir/aarch64/AArch64SHA512Op.java    |   0
 .../lir/aarch64/AArch64SaveRegistersOp.java   |   0
 .../aarch64/AArch64SpeculativeBarrier.java    |   0
 .../graal/lir/aarch64/AArch64SpinWaitOp.java  |   0
 .../aarch64/AArch64StringLatin1InflateOp.java |   0
 .../aarch64/AArch64StringUTF16CompressOp.java |   0
 .../aarch64/AArch64VectorizedMismatchOp.java  |   0
 .../lir/aarch64/AArch64ZapRegistersOp.java    |   0
 .../graal/lir/aarch64/AArch64ZapStackOp.java  |   0
 .../lir/aarch64/AArch64ZeroMemoryOp.java      |   0
 .../lir/alloc/AllocationStageVerifier.java    |   0
 .../lir/alloc/OutOfRegistersException.java    |   0
 .../lir/alloc/RegisterAllocationPhase.java    |   0
 .../lir/alloc/SaveCalleeSaveRegisters.java    |   0
 .../graal/lir/alloc/lsra/Interval.java        |   0
 .../graal/lir/alloc/lsra/IntervalWalker.java  |   0
 .../graal/lir/alloc/lsra/LinearScan.java      |   0
 .../alloc/lsra/LinearScanAllocationPhase.java |   0
 .../lsra/LinearScanAssignLocationsPhase.java  |   0
 .../LinearScanEliminateSpillMovePhase.java    |   0
 .../alloc/lsra/LinearScanIntervalDumper.java  |   0
 .../lsra/LinearScanLifetimeAnalysisPhase.java |   0
 .../LinearScanOptimizeSpillPositionPhase.java |   0
 .../graal/lir/alloc/lsra/LinearScanPhase.java |   0
 .../LinearScanRegisterAllocationPhase.java    |   0
 .../lsra/LinearScanResolveDataFlowPhase.java  |   0
 .../lir/alloc/lsra/LinearScanWalker.java      |   0
 .../graal/lir/alloc/lsra/MoveResolver.java    |   0
 .../lsra/OptimizingLinearScanWalker.java      |   0
 .../compiler/graal/lir/alloc/lsra/Range.java  |   0
 .../lir/alloc/lsra/RegisterVerifier.java      |   0
 .../lir/alloc/lsra/ssa/SSALinearScan.java     |   0
 .../SSALinearScanEliminateSpillMovePhase.java |   0
 .../SSALinearScanLifetimeAnalysisPhase.java   |   0
 .../SSALinearScanResolveDataFlowPhase.java    |   0
 .../lir/alloc/lsra/ssa/SSAMoveResolver.java   |   0
 .../graal/lir/amd64/AMD64AESDecryptOp.java    |   0
 .../graal/lir/amd64/AMD64AESEncryptOp.java    |   0
 .../graal/lir/amd64/AMD64AddressValue.java    |   0
 .../graal/lir/amd64/AMD64Arithmetic.java      |   0
 .../AMD64ArithmeticLIRGeneratorTool.java      |   0
 .../lir/amd64/AMD64ArrayCompareToOp.java      |   0
 .../AMD64ArrayCopyWithConversionsOp.java      |   0
 .../graal/lir/amd64/AMD64ArrayEqualsOp.java   |   0
 .../graal/lir/amd64/AMD64ArrayIndexOfOp.java  |   0
 .../amd64/AMD64ArrayRegionCompareToOp.java    |   0
 .../lir/amd64/AMD64BigIntegerMulAddOp.java    |   0
 .../amd64/AMD64BigIntegerMultiplyToLenOp.java |   0
 .../amd64/AMD64BigIntegerSquareToLenOp.java   |   0
 .../compiler/graal/lir/amd64/AMD64Binary.java |   0
 .../graal/lir/amd64/AMD64BinaryConsumer.java  |   0
 .../graal/lir/amd64/AMD64BitSwapOp.java       |   0
 .../graal/lir/amd64/AMD64BlockEndOp.java      |   0
 .../graal/lir/amd64/AMD64BreakpointOp.java    |   0
 .../graal/lir/amd64/AMD64ByteSwapOp.java      |   0
 .../lir/amd64/AMD64CacheWritebackOp.java      |   0
 .../amd64/AMD64CacheWritebackPostSyncOp.java  |   0
 .../amd64/AMD64CalcStringAttributesOp.java    |   0
 .../compiler/graal/lir/amd64/AMD64Call.java   |   0
 .../AMD64CipherBlockChainingAESDecryptOp.java |   0
 .../AMD64CipherBlockChainingAESEncryptOp.java |   0
 .../graal/lir/amd64/AMD64ClearRegisterOp.java |   0
 .../graal/lir/amd64/AMD64ComplexVectorOp.java |   0
 .../graal/lir/amd64/AMD64ControlFlow.java     |   0
 .../lir/amd64/AMD64CountPositivesOp.java      |   0
 .../lir/amd64/AMD64CounterModeAESCryptOp.java |   0
 .../graal/lir/amd64/AMD64EncodeArrayOp.java   |   0
 .../lir/amd64/AMD64FloatToHalfFloatOp.java    |   0
 .../graal/lir/amd64/AMD64FrameMap.java        |   0
 .../graal/lir/amd64/AMD64FrameMapBuilder.java |   0
 .../lir/amd64/AMD64GHASHProcessBlocksOp.java  |   0
 .../lir/amd64/AMD64HalfFloatToFloatOp.java    |   0
 .../compiler/graal/lir/amd64/AMD64HaltOp.java |   0
 .../graal/lir/amd64/AMD64LFenceOp.java        |   0
 .../graal/lir/amd64/AMD64LIRHelper.java       |   0
 .../graal/lir/amd64/AMD64LIRInstruction.java  |   0
 .../compiler/graal/lir/amd64/AMD64MD5Op.java  |   0
 .../graal/lir/amd64/AMD64MathCopySignOp.java  |   0
 .../graal/lir/amd64/AMD64MathCosOp.java       |   0
 .../graal/lir/amd64/AMD64MathExpOp.java       |   0
 .../lir/amd64/AMD64MathIntrinsicBinaryOp.java |   0
 .../lir/amd64/AMD64MathIntrinsicUnaryOp.java  |   0
 .../graal/lir/amd64/AMD64MathLog10Op.java     |   0
 .../graal/lir/amd64/AMD64MathLogOp.java       |   0
 .../graal/lir/amd64/AMD64MathPowOp.java       |   0
 .../graal/lir/amd64/AMD64MathSignumOp.java    |   0
 .../graal/lir/amd64/AMD64MathSinOp.java       |   0
 .../graal/lir/amd64/AMD64MathTanOp.java       |   0
 .../compiler/graal/lir/amd64/AMD64Move.java   |   0
 .../graal/lir/amd64/AMD64MulDivOp.java        |   0
 .../AMD64NormalizedUnsignedCompareOp.java     |   0
 .../graal/lir/amd64/AMD64PauseOp.java         |   0
 .../graal/lir/amd64/AMD64PrefetchOp.java      |   0
 .../graal/lir/amd64/AMD64ReadProcid.java      |   0
 .../AMD64ReadTimestampCounterWithProcid.java  |   0
 .../lir/amd64/AMD64RestoreRegistersOp.java    |   0
 .../lir/amd64/AMD64RoundFloatToIntegerOp.java |   0
 .../compiler/graal/lir/amd64/AMD64SHA1Op.java |   0
 .../graal/lir/amd64/AMD64SHA256AVX2Op.java    |   0
 .../graal/lir/amd64/AMD64SHA256Op.java        |   0
 .../graal/lir/amd64/AMD64SHA512Op.java        |   0
 .../graal/lir/amd64/AMD64SaveRegistersOp.java |   0
 .../graal/lir/amd64/AMD64ShiftOp.java         |   0
 .../graal/lir/amd64/AMD64SignExtendOp.java    |   0
 .../lir/amd64/AMD64StringLatin1InflateOp.java |   0
 .../lir/amd64/AMD64StringUTF16CompressOp.java |   0
 .../graal/lir/amd64/AMD64Ternary.java         |   0
 .../compiler/graal/lir/amd64/AMD64Unary.java  |   0
 .../graal/lir/amd64/AMD64UnaryConsumer.java   |   0
 .../graal/lir/amd64/AMD64VZeroUpper.java      |   0
 .../lir/amd64/AMD64VectorizedHashCodeOp.java  |   0
 .../lir/amd64/AMD64VectorizedMismatchOp.java  |   0
 .../graal/lir/amd64/AMD64ZapRegistersOp.java  |   0
 .../graal/lir/amd64/AMD64ZapStackOp.java      |   0
 .../graal/lir/amd64/AMD64ZeroMemoryOp.java    |   0
 .../compiler/graal/lir/amd64/EndbranchOp.java |   0
 .../phases/StackMoveOptimizationPhase.java    |   0
 .../lir/amd64/vector/AMD64VectorBinary.java   |   0
 .../lir/amd64/vector/AMD64VectorBlend.java    |   0
 .../lir/amd64/vector/AMD64VectorClearOp.java  |   0
 .../amd64/vector/AMD64VectorCompareOp.java    |   0
 .../vector/AMD64VectorFloatCompareOp.java     |   0
 .../lir/amd64/vector/AMD64VectorGather.java   |   0
 .../amd64/vector/AMD64VectorInstruction.java  |   0
 .../lir/amd64/vector/AMD64VectorMove.java     |   0
 .../lir/amd64/vector/AMD64VectorShuffle.java  |   0
 .../lir/amd64/vector/AMD64VectorUnary.java    |   0
 .../graal/lir/amd64/vector/AVX512Support.java |   0
 .../lir/asm/ArrayDataPointerConstant.java     |   0
 .../lir/asm/CompilationResultBuilder.java     |   0
 .../asm/CompilationResultBuilderFactory.java  |   0
 .../compiler/graal/lir/asm/DataBuilder.java   |   0
 .../graal/lir/asm/EntryPointDecorator.java    |   0
 .../compiler/graal/lir/asm/FrameContext.java  |   0
 .../constopt/ConstantLoadOptimization.java    |   0
 .../graal/lir/constopt/ConstantTree.java      |   0
 .../lir/constopt/ConstantTreeAnalyzer.java    |   0
 .../graal/lir/constopt/DefUseTree.java        |   0
 .../compiler/graal/lir/constopt/UseEntry.java |   0
 .../graal/lir/constopt/VariableMap.java       |   0
 .../graal/lir/debug/IntervalDumper.java       |   0
 .../lir/debug/LIRGenerationDebugContext.java  |   0
 .../graal/lir/dfa/LocationMarker.java         |   0
 .../graal/lir/dfa/LocationMarkerPhase.java    |   0
 .../graal/lir/dfa/MarkBasePointersPhase.java  |   0
 .../graal/lir/dfa/RegStackValueSet.java       |   0
 .../graal/lir/dfa/UniqueWorkList.java         |   0
 .../compiler/graal/lir/framemap/FrameMap.java |   0
 .../graal/lir/framemap/FrameMapBuilder.java   |   0
 .../lir/framemap/FrameMapBuilderImpl.java     |   0
 .../lir/framemap/FrameMapBuilderTool.java     |   0
 .../lir/framemap/ReferenceMapBuilder.java     |   0
 .../lir/framemap/SimpleVirtualStackSlot.java  |   0
 .../framemap/SimpleVirtualStackSlotAlias.java |   0
 .../lir/framemap/VirtualStackSlotRange.java   |   0
 .../graal/lir/gen/ArithmeticLIRGenerator.java |   0
 .../lir/gen/ArithmeticLIRGeneratorTool.java   |   0
 .../graal/lir/gen/BarrierSetLIRGenerator.java |   0
 .../lir/gen/BarrierSetLIRGeneratorTool.java   |   0
 .../lir/gen/DiagnosticLIRGeneratorTool.java   |   0
 .../graal/lir/gen/LIRGenerationResult.java    |   0
 .../compiler/graal/lir/gen/LIRGenerator.java  |   0
 .../graal/lir/gen/LIRGeneratorTool.java       |   0
 .../compiler/graal/lir/gen/MoveFactory.java   |   0
 .../graal/lir/gen/VerifyingMoveFactory.java   |   0
 .../compiler/graal/lir/hashing/IntHasher.java |   0
 .../graal/lir/phases/AllocationPhase.java     |   0
 .../graal/lir/phases/AllocationStage.java     |   0
 .../lir/phases/EconomyAllocationStage.java    |   0
 .../phases/EconomyFinalCodeAnalysisStage.java |   0
 ...conomyPostAllocationOptimizationStage.java |   0
 ...EconomyPreAllocationOptimizationStage.java |   0
 .../lir/phases/FinalCodeAnalysisPhase.java    |   0
 .../lir/phases/FinalCodeAnalysisStage.java    |   0
 .../compiler/graal/lir/phases/LIRPhase.java   |   0
 .../graal/lir/phases/LIRPhaseSuite.java       |   0
 .../compiler/graal/lir/phases/LIRSuites.java  |   0
 .../PostAllocationOptimizationPhase.java      |   0
 .../PostAllocationOptimizationStage.java      |   0
 .../PreAllocationOptimizationPhase.java       |   0
 .../PreAllocationOptimizationStage.java       |   0
 .../lir/profiling/MethodProfilingPhase.java   |   0
 .../graal/lir/profiling/MoveProfiler.java     |   0
 .../lir/profiling/MoveProfilingPhase.java     |   0
 .../graal/lir/profiling/MoveType.java         |   0
 .../jdk/compiler/graal/lir/ssa/SSAUtil.java   |   0
 .../compiler/graal/lir/ssa/SSAVerifier.java   |   0
 .../FixPointIntervalBuilder.java              |   0
 .../stackslotalloc/LSStackSlotAllocator.java  |   0
 .../SimpleStackSlotAllocator.java             |   0
 .../lir/stackslotalloc/StackInterval.java     |   0
 .../stackslotalloc/StackIntervalDumper.java   |   0
 .../StackSlotAllocatorUtil.java               |   0
 .../graal/lir/util/GenericValueMap.java       |   0
 .../graal/lir/util/IndexedValueMap.java       |   0
 .../compiler/graal/lir/util/RegisterMap.java  |   0
 .../jdk/compiler/graal/lir/util/ValueMap.java |   0
 .../jdk/compiler/graal/lir/util/ValueSet.java |   0
 .../phases/ConvertDeoptimizeToGuardPhase.java |   0
 .../loop/phases/LoopFullUnrollPhase.java      |   0
 .../loop/phases/LoopPartialUnrollPhase.java   |   0
 .../graal/loop/phases/LoopPeelingPhase.java   |   0
 .../compiler/graal/loop/phases/LoopPhase.java |   0
 .../loop/phases/LoopPredicationPhase.java     |   0
 .../phases/LoopSafepointEliminationPhase.java |   0
 .../loop/phases/LoopTransformations.java      |   0
 .../loop/phases/LoopUnswitchingPhase.java     |   0
 .../phases/SpeculativeGuardMovementPhase.java |   0
 .../compiler/graal/nodeinfo/InputType.java    |   0
 .../compiler/graal/nodeinfo/NodeCycles.java   |   0
 .../jdk/compiler/graal/nodeinfo/NodeInfo.java |   0
 .../jdk/compiler/graal/nodeinfo/NodeSize.java |   0
 .../graal/nodeinfo/StructuralInput.java       |   0
 .../compiler/graal/nodeinfo/Verbosity.java    |   0
 .../graal/nodes/AbstractBeginNode.java        |   0
 .../graal/nodes/AbstractDeoptimizeNode.java   |   0
 .../compiler/graal/nodes/AbstractEndNode.java |   0
 .../graal/nodes/AbstractFixedGuardNode.java   |   0
 .../graal/nodes/AbstractLocalNode.java        |   0
 .../graal/nodes/AbstractMergeNode.java        |   0
 .../graal/nodes/AbstractStateSplit.java       |   0
 .../graal/nodes/ArithmeticOperation.java      |   0
 .../jdk/compiler/graal/nodes/BeginNode.java   |   0
 .../graal/nodes/BeginStateSplitNode.java      |   0
 .../graal/nodes/BinaryOpLogicNode.java        |   0
 .../compiler/graal/nodes/BreakpointNode.java  |   0
 .../compiler/graal/nodes/CallTargetNode.java  |   0
 .../jdk/compiler/graal/nodes/Cancellable.java |   0
 .../graal/nodes/CanonicalizableLocation.java  |   0
 .../graal/nodes/CompanionObjectEncoder.java   |   0
 .../compiler/graal/nodes/CompressionNode.java |   0
 .../graal/nodes/ComputeObjectAddressNode.java |   0
 .../graal/nodes/ConditionAnchorNode.java      |   0
 .../compiler/graal/nodes/ConstantNode.java    |   0
 .../compiler/graal/nodes/ControlSinkNode.java |   0
 .../graal/nodes/ControlSplitNode.java         |   0
 .../jdk/compiler/graal/nodes/DeadEndNode.java |   0
 .../graal/nodes/DeoptBciSupplier.java         |   0
 .../compiler/graal/nodes/DeoptimizeNode.java  |   0
 .../nodes/DeoptimizingFixedWithNextNode.java  |   0
 .../graal/nodes/DeoptimizingGuard.java        |   0
 .../graal/nodes/DeoptimizingNode.java         |   0
 .../graal/nodes/DirectCallTargetNode.java     |   0
 .../graal/nodes/DynamicDeoptimizeNode.java    |   0
 .../compiler/graal/nodes/DynamicPiNode.java   |   0
 .../compiler/graal/nodes/EncodedGraph.java    |   0
 .../src/jdk/compiler/graal/nodes/EndNode.java |   0
 .../compiler/graal/nodes/EntryMarkerNode.java |   0
 .../compiler/graal/nodes/EntryProxyNode.java  |   0
 .../graal/nodes/FieldLocationIdentity.java    |   0
 .../compiler/graal/nodes/FixedGuardNode.java  |   0
 .../jdk/compiler/graal/nodes/FixedNode.java   |   0
 .../graal/nodes/FixedNodeInterface.java       |   0
 .../graal/nodes/FixedWithNextNode.java        |   0
 .../nodes/FixedWithNextNodeInterface.java     |   0
 .../graal/nodes/FloatingAnchoredNode.java     |   0
 .../graal/nodes/FloatingGuardedNode.java      |   0
 .../jdk/compiler/graal/nodes/FrameState.java  |   0
 .../graal/nodes/FullInfopointNode.java        |   0
 .../graal/nodes/GetObjectAddressNode.java     |   0
 .../compiler/graal/nodes/GraphDecoder.java    |   0
 .../compiler/graal/nodes/GraphEncoder.java    |   0
 .../jdk/compiler/graal/nodes/GraphState.java  |   0
 .../jdk/compiler/graal/nodes/GuardNode.java   |   0
 .../compiler/graal/nodes/GuardPhiNode.java    |   0
 .../compiler/graal/nodes/GuardProxyNode.java  |   0
 .../graal/nodes/GuardedValueNode.java         |   0
 .../src/jdk/compiler/graal/nodes/IfNode.java  |   0
 .../graal/nodes/ImplicitNullCheckNode.java    |   0
 .../graal/nodes/IndirectCallTargetNode.java   |   0
 .../jdk/compiler/graal/nodes/InliningLog.java |   0
 .../graal/nodes/InliningLogCodec.java         |   0
 .../jdk/compiler/graal/nodes/Invokable.java   |   0
 .../src/jdk/compiler/graal/nodes/Invoke.java  |   0
 .../jdk/compiler/graal/nodes/InvokeNode.java  |   0
 .../graal/nodes/InvokeWithExceptionNode.java  |   0
 .../graal/nodes/LIRLowerableLogicNode.java    |   0
 .../graal/nodes/LogicConstantNode.java        |   0
 .../graal/nodes/LogicNegationNode.java        |   0
 .../jdk/compiler/graal/nodes/LogicNode.java   |   0
 .../compiler/graal/nodes/LoopBeginNode.java   |   0
 .../jdk/compiler/graal/nodes/LoopEndNode.java |   0
 .../compiler/graal/nodes/LoopExitNode.java    |   0
 .../graal/nodes/LoweredCallTargetNode.java    |   0
 .../graal/nodes/MemoryMapControlSinkNode.java |   0
 .../compiler/graal/nodes/MemoryProxyNode.java |   0
 .../jdk/compiler/graal/nodes/MergeNode.java   |   0
 .../graal/nodes/NamedLocationIdentity.java    |   0
 .../jdk/compiler/graal/nodes/NodeView.java    |   0
 .../compiler/graal/nodes/OptimizationLog.java |   0
 .../graal/nodes/OptimizationLogCodec.java     |   0
 .../graal/nodes/OptimizationLogImpl.java      |   0
 .../compiler/graal/nodes/ParameterNode.java   |   0
 .../jdk/compiler/graal/nodes/PauseNode.java   |   0
 .../src/jdk/compiler/graal/nodes/PhiNode.java |   0
 .../jdk/compiler/graal/nodes/PiArrayNode.java |   0
 .../src/jdk/compiler/graal/nodes/PiNode.java  |   0
 .../nodes/PluginReplacementInterface.java     |   0
 .../graal/nodes/PluginReplacementNode.java    |   0
 .../PluginReplacementWithExceptionNode.java   |   0
 .../graal/nodes/PrefetchAllocateNode.java     |   0
 .../jdk/compiler/graal/nodes/ProfileData.java |   0
 .../jdk/compiler/graal/nodes/ProxyNode.java   |   0
 .../jdk/compiler/graal/nodes/ReturnNode.java  |   0
 .../compiler/graal/nodes/SafepointNode.java   |   0
 .../graal/nodes/ShortCircuitOrNode.java       |   0
 .../graal/nodes/SimplifyingGraphDecoder.java  |   0
 .../graal/nodes/SnippetAnchorNode.java        |   0
 .../compiler/graal/nodes/SpinWaitNode.java    |   0
 .../jdk/compiler/graal/nodes/StartNode.java   |   0
 .../jdk/compiler/graal/nodes/StateSplit.java  |   0
 .../graal/nodes/StaticDeoptimizingNode.java   |   0
 .../compiler/graal/nodes/StructuredGraph.java |   0
 .../compiler/graal/nodes/TypeCheckHints.java  |   0
 .../graal/nodes/UnaryOpLogicNode.java         |   0
 .../graal/nodes/UnreachableBeginNode.java     |   0
 .../nodes/UnreachableControlSinkNode.java     |   0
 .../compiler/graal/nodes/UnreachableNode.java |   0
 .../jdk/compiler/graal/nodes/UnwindNode.java  |   0
 .../jdk/compiler/graal/nodes/ValueNode.java   |   0
 .../graal/nodes/ValueNodeInterface.java       |   0
 .../compiler/graal/nodes/ValuePhiNode.java    |   0
 .../compiler/graal/nodes/ValueProxyNode.java  |   0
 .../compiler/graal/nodes/VirtualState.java    |   0
 .../graal/nodes/WithExceptionNode.java        |   0
 .../compiler/graal/nodes/calc/AbsNode.java    |   0
 .../calc/AbstractNormalizeCompareNode.java    |   0
 .../compiler/graal/nodes/calc/AddNode.java    |   0
 .../compiler/graal/nodes/calc/AndNode.java    |   0
 .../nodes/calc/BinaryArithmeticNode.java      |   0
 .../compiler/graal/nodes/calc/BinaryNode.java |   0
 .../graal/nodes/calc/CompareNode.java         |   0
 .../graal/nodes/calc/CompressBitsNode.java    |   0
 .../graal/nodes/calc/ConditionalNode.java     |   0
 .../graal/nodes/calc/ConvertNode.java         |   0
 .../graal/nodes/calc/CopySignNode.java        |   0
 .../graal/nodes/calc/ExpandBitsNode.java      |   0
 .../graal/nodes/calc/FixedBinaryNode.java     |   0
 .../graal/nodes/calc/FloatConvertNode.java    |   0
 .../graal/nodes/calc/FloatDivNode.java        |   0
 .../graal/nodes/calc/FloatEqualsNode.java     |   0
 .../graal/nodes/calc/FloatLessThanNode.java   |   0
 .../nodes/calc/FloatNormalizeCompareNode.java |   0
 .../graal/nodes/calc/FloatTypeTestNode.java   |   0
 .../nodes/calc/FloatingIntegerDivRemNode.java |   0
 .../graal/nodes/calc/FloatingNode.java        |   0
 .../graal/nodes/calc/IntegerBelowNode.java    |   0
 .../graal/nodes/calc/IntegerConvertNode.java  |   0
 .../graal/nodes/calc/IntegerDivRemNode.java   |   0
 .../graal/nodes/calc/IntegerEqualsNode.java   |   0
 .../graal/nodes/calc/IntegerLessThanNode.java |   0
 .../nodes/calc/IntegerLowerThanNode.java      |   0
 .../graal/nodes/calc/IntegerMulHighNode.java  |   0
 .../calc/IntegerNormalizeCompareNode.java     |   0
 .../graal/nodes/calc/IntegerTestNode.java     |   0
 .../compiler/graal/nodes/calc/IsNullNode.java |   0
 .../graal/nodes/calc/LeftShiftNode.java       |   0
 .../compiler/graal/nodes/calc/MaxNode.java    |   0
 .../compiler/graal/nodes/calc/MinMaxNode.java |   0
 .../compiler/graal/nodes/calc/MinNode.java    |   0
 .../compiler/graal/nodes/calc/MulNode.java    |   0
 .../compiler/graal/nodes/calc/NarrowNode.java |   0
 .../nodes/calc/NarrowableArithmeticNode.java  |   0
 .../compiler/graal/nodes/calc/NegateNode.java |   0
 .../compiler/graal/nodes/calc/NotNode.java    |   0
 .../graal/nodes/calc/ObjectEqualsNode.java    |   0
 .../jdk/compiler/graal/nodes/calc/OrNode.java |   0
 .../graal/nodes/calc/PointerEqualsNode.java   |   0
 .../graal/nodes/calc/ReinterpretNode.java     |   0
 .../compiler/graal/nodes/calc/RemNode.java    |   0
 .../graal/nodes/calc/RightShiftNode.java      |   0
 .../nodes/calc/RoundFloatToIntegerNode.java   |   0
 .../compiler/graal/nodes/calc/RoundNode.java  |   0
 .../compiler/graal/nodes/calc/ShiftNode.java  |   0
 .../graal/nodes/calc/SignExtendNode.java      |   0
 .../graal/nodes/calc/SignedDivNode.java       |   0
 .../calc/SignedFloatingIntegerDivNode.java    |   0
 .../calc/SignedFloatingIntegerRemNode.java    |   0
 .../graal/nodes/calc/SignedRemNode.java       |   0
 .../compiler/graal/nodes/calc/SignumNode.java |   0
 .../compiler/graal/nodes/calc/SqrtNode.java   |   0
 .../compiler/graal/nodes/calc/SubNode.java    |   0
 .../graal/nodes/calc/TernaryNode.java         |   0
 .../graal/nodes/calc/UnaryArithmeticNode.java |   0
 .../compiler/graal/nodes/calc/UnaryNode.java  |   0
 .../nodes/calc/UnpackEndianHalfNode.java      |   0
 .../graal/nodes/calc/UnsignedDivNode.java     |   0
 .../graal/nodes/calc/UnsignedMaxNode.java     |   0
 .../graal/nodes/calc/UnsignedMinNode.java     |   0
 .../graal/nodes/calc/UnsignedRemNode.java     |   0
 .../nodes/calc/UnsignedRightShiftNode.java    |   0
 .../compiler/graal/nodes/calc/XorNode.java    |   0
 .../graal/nodes/calc/ZeroExtendNode.java      |   0
 .../graal/nodes/cfg/ControlFlowGraph.java     |   0
 .../compiler/graal/nodes/cfg/HIRBlock.java    |   0
 .../jdk/compiler/graal/nodes/cfg/HIRLoop.java |   0
 .../compiler/graal/nodes/cfg/LocationSet.java |   0
 .../graal/nodes/cfg/ReversePostOrder.java     |   0
 .../graal/nodes/debug/BindToRegisterNode.java |   0
 .../graal/nodes/debug/BlackholeNode.java      |   0
 .../nodes/debug/ControlFlowAnchorNode.java    |   0
 .../nodes/debug/ControlFlowAnchored.java      |   0
 .../graal/nodes/debug/DynamicCounterNode.java |   0
 .../graal/nodes/debug/NeverStripMineNode.java |   0
 .../graal/nodes/debug/NeverWriteSinkNode.java |   0
 .../graal/nodes/debug/SideEffectNode.java     |   0
 .../graal/nodes/debug/SpillRegistersNode.java |   0
 .../graal/nodes/debug/StringToBytesNode.java  |   0
 .../graal/nodes/debug/VerifyHeapNode.java     |   0
 .../nodes/extended/AbstractBoxingNode.java    |   0
 .../graal/nodes/extended/AnchoringNode.java   |   0
 .../graal/nodes/extended/ArrayRangeWrite.java |   0
 .../graal/nodes/extended/BoxNode.java         |   0
 .../nodes/extended/BranchProbabilityNode.java |   0
 .../nodes/extended/BytecodeExceptionNode.java |   0
 .../nodes/extended/CacheWritebackNode.java    |   0
 .../extended/CacheWritebackSyncNode.java      |   0
 .../nodes/extended/CaptureStateBeginNode.java |   0
 .../nodes/extended/ClassIsArrayNode.java      |   0
 .../nodes/extended/FixedValueAnchorNode.java  |   0
 .../graal/nodes/extended/ForeignCall.java     |   0
 .../graal/nodes/extended/ForeignCallNode.java |   0
 .../graal/nodes/extended/GetClassNode.java    |   0
 .../graal/nodes/extended/GuardedNode.java     |   0
 .../nodes/extended/GuardedUnsafeLoadNode.java |   0
 .../graal/nodes/extended/GuardingNode.java    |   0
 .../extended/HubGetClassNodeInterface.java    |   0
 .../nodes/extended/IntegerSwitchNode.java     |   0
 .../graal/nodes/extended/JavaReadNode.java    |   0
 .../graal/nodes/extended/JavaWriteNode.java   |   0
 .../extended/LoadArrayComponentHubNode.java   |   0
 .../graal/nodes/extended/LoadHubNode.java     |   0
 .../nodes/extended/LoadHubOrNullNode.java     |   0
 .../graal/nodes/extended/LoadMethodNode.java  |   0
 .../graal/nodes/extended/MembarNode.java      |   0
 .../graal/nodes/extended/MonitorEnter.java    |   0
 .../graal/nodes/extended/MonitorExit.java     |   0
 .../graal/nodes/extended/MultiGuardNode.java  |   0
 .../graal/nodes/extended/NullCheckNode.java   |   0
 .../graal/nodes/extended/OSRLocalNode.java    |   0
 .../graal/nodes/extended/OSRLockNode.java     |   0
 .../nodes/extended/OSRMonitorEnterNode.java   |   0
 .../graal/nodes/extended/OSRStartNode.java    |   0
 .../nodes/extended/ObjectIsArrayNode.java     |   0
 .../graal/nodes/extended/OpaqueGuardNode.java |   0
 .../graal/nodes/extended/OpaqueLogicNode.java |   0
 .../graal/nodes/extended/OpaqueNode.java      |   0
 .../graal/nodes/extended/OpaqueValueNode.java |   0
 .../graal/nodes/extended/RawLoadNode.java     |   0
 .../graal/nodes/extended/RawStoreNode.java    |   0
 .../nodes/extended/StateSplitProxyNode.java   |   0
 .../graal/nodes/extended/StoreHubNode.java    |   0
 .../extended/SwitchCaseProbabilityNode.java   |   0
 .../graal/nodes/extended/SwitchNode.java      |   0
 .../graal/nodes/extended/UnboxNode.java       |   0
 .../nodes/extended/UnsafeAccessNode.java      |   0
 .../graal/nodes/extended/UnsafeCopyNode.java  |   0
 .../nodes/extended/UnsafeMemoryLoadNode.java  |   0
 .../nodes/extended/UnsafeMemoryStoreNode.java |   0
 .../graal/nodes/extended/ValueAnchorNode.java |   0
 .../nodes/gc/ArrayRangeWriteBarrier.java      |   0
 .../compiler/graal/nodes/gc/BarrierSet.java   |   0
 .../graal/nodes/gc/CardTableBarrierSet.java   |   0
 .../gc/G1ArrayRangePostWriteBarrier.java      |   0
 .../nodes/gc/G1ArrayRangePreWriteBarrier.java |   0
 .../compiler/graal/nodes/gc/G1BarrierSet.java |   0
 .../graal/nodes/gc/G1PostWriteBarrier.java    |   0
 .../graal/nodes/gc/G1PreWriteBarrier.java     |   0
 .../nodes/gc/G1ReferentFieldReadBarrier.java  |   0
 .../graal/nodes/gc/ObjectWriteBarrier.java    |   0
 .../gc/SerialArrayRangeWriteBarrier.java      |   0
 .../graal/nodes/gc/SerialWriteBarrier.java    |   0
 .../compiler/graal/nodes/gc/WriteBarrier.java |   0
 .../compiler/graal/nodes/gc/ZBarrierSet.java  |   0
 .../ClassInitializationPlugin.java            |   0
 .../graphbuilderconf/ForeignCallPlugin.java   |   0
 .../GeneratedFoldInvocationPlugin.java        |   0
 .../GeneratedInvocationPlugin.java            |   0
 ...eneratedNodeIntrinsicInvocationPlugin.java |   0
 .../GeneratedPluginFactory.java               |   0
 .../GeneratedPluginInjectionProvider.java     |   0
 .../GraphBuilderConfiguration.java            |   0
 .../graphbuilderconf/GraphBuilderContext.java |   0
 .../graphbuilderconf/GraphBuilderPlugin.java  |   0
 .../graphbuilderconf/GraphBuilderTool.java    |   0
 .../graphbuilderconf/InlineInvokePlugin.java  |   0
 .../graphbuilderconf/IntrinsicContext.java    |   0
 .../graphbuilderconf/InvocationPlugin.java    |   0
 .../InvocationPluginContext.java              |   0
 .../graphbuilderconf/InvocationPlugins.java   |   0
 .../graphbuilderconf/LoopExplosionPlugin.java |   0
 .../nodes/graphbuilderconf/NodePlugin.java    |   0
 .../graphbuilderconf/ParameterPlugin.java     |   0
 .../nodes/graphbuilderconf/TypePlugin.java    |   0
 .../java/AbstractCompareAndSwapNode.java      |   0
 .../nodes/java/AbstractNewArrayNode.java      |   0
 .../nodes/java/AbstractNewObjectNode.java     |   0
 .../AbstractUnsafeCompareAndSwapNode.java     |   0
 .../graal/nodes/java/AccessArrayNode.java     |   0
 .../graal/nodes/java/AccessFieldNode.java     |   0
 .../graal/nodes/java/AccessIndexedNode.java   |   0
 .../graal/nodes/java/AccessMonitorNode.java   |   0
 .../graal/nodes/java/ArrayLengthNode.java     |   0
 .../nodes/java/AtomicReadAndAddNode.java      |   0
 .../nodes/java/AtomicReadAndWriteNode.java    |   0
 .../nodes/java/ClassIsAssignableFromNode.java |   0
 .../graal/nodes/java/DynamicNewArrayNode.java |   0
 .../nodes/java/DynamicNewInstanceNode.java    |   0
 .../graal/nodes/java/ExceptionObjectNode.java |   0
 .../nodes/java/FinalFieldBarrierNode.java     |   0
 .../nodes/java/ForeignCallDescriptors.java    |   0
 .../nodes/java/InstanceOfDynamicNode.java     |   0
 .../graal/nodes/java/InstanceOfNode.java      |   0
 .../nodes/java/LoadExceptionObjectNode.java   |   0
 .../graal/nodes/java/LoadFieldNode.java       |   0
 .../graal/nodes/java/LoadIndexedNode.java     |   0
 .../nodes/java/LogicCompareAndSwapNode.java   |   0
 .../java/LoweredAtomicReadAndAddNode.java     |   0
 .../java/LoweredAtomicReadAndWriteNode.java   |   0
 .../java/LoweredRegisterFinalizerNode.java    |   0
 .../nodes/java/MethodCallTargetNode.java      |   0
 .../graal/nodes/java/MonitorEnterNode.java    |   0
 .../graal/nodes/java/MonitorExitNode.java     |   0
 .../graal/nodes/java/MonitorIdNode.java       |   0
 .../graal/nodes/java/NewArrayInterface.java   |   0
 .../graal/nodes/java/NewArrayNode.java        |   0
 .../graal/nodes/java/NewInstanceNode.java     |   0
 .../graal/nodes/java/NewMultiArrayNode.java   |   0
 .../nodes/java/ReachabilityFenceNode.java     |   0
 .../nodes/java/RegisterFinalizerNode.java     |   0
 .../graal/nodes/java/StoreFieldNode.java      |   0
 .../graal/nodes/java/StoreIndexedNode.java    |   0
 .../graal/nodes/java/TypeSwitchNode.java      |   0
 .../java/UnsafeCompareAndExchangeNode.java    |   0
 .../nodes/java/UnsafeCompareAndSwapNode.java  |   0
 .../java/ValidateNewInstanceClassNode.java    |   0
 .../nodes/java/ValueCompareAndSwapNode.java   |   0
 .../nodes/loop/BasicInductionVariable.java    |   0
 .../graal/nodes/loop/CountedLoopInfo.java     |   0
 .../graal/nodes/loop/DefaultLoopPolicies.java |   0
 .../DerivedConvertedInductionVariable.java    |   0
 .../nodes/loop/DerivedInductionVariable.java  |   0
 .../loop/DerivedOffsetInductionVariable.java  |   0
 .../loop/DerivedScaledInductionVariable.java  |   0
 .../graal/nodes/loop/InductionVariable.java   |   0
 .../nodes/loop/InductionVariableHelper.java   |   0
 .../jdk/compiler/graal/nodes/loop/LoopEx.java |   0
 .../graal/nodes/loop/LoopExpandableNode.java  |   0
 .../graal/nodes/loop/LoopFragment.java        |   0
 .../graal/nodes/loop/LoopFragmentInside.java  |   0
 .../nodes/loop/LoopFragmentInsideBefore.java  |   0
 .../nodes/loop/LoopFragmentInsideFrom.java    |   0
 .../graal/nodes/loop/LoopFragmentWhole.java   |   0
 .../graal/nodes/loop/LoopPolicies.java        |   0
 .../compiler/graal/nodes/loop/LoopsData.java  |   0
 .../nodes/loop/LoopsDataProviderImpl.java     |   0
 .../compiler/graal/nodes/loop/MathUtil.java   |   0
 .../memory/AbstractMemoryCheckpoint.java      |   0
 .../graal/nodes/memory/AbstractWriteNode.java |   0
 .../nodes/memory/AddressableMemoryAccess.java |   0
 .../nodes/memory/ExtendableMemoryAccess.java  |   0
 .../graal/nodes/memory/FixedAccessNode.java   |   0
 .../nodes/memory/FloatableAccessNode.java     |   0
 .../memory/FloatableThreadLocalAccess.java    |   0
 .../nodes/memory/FloatingAccessNode.java      |   0
 .../graal/nodes/memory/FloatingReadNode.java  |   0
 .../nodes/memory/GuardedMemoryAccess.java     |   0
 .../nodes/memory/LIRLowerableAccess.java      |   0
 .../graal/nodes/memory/MemoryAccess.java      |   0
 .../graal/nodes/memory/MemoryAnchorNode.java  |   0
 .../graal/nodes/memory/MemoryKill.java        |   0
 .../graal/nodes/memory/MemoryMap.java         |   0
 .../graal/nodes/memory/MemoryMapNode.java     |   0
 .../graal/nodes/memory/MemoryPhiNode.java     |   0
 .../graal/nodes/memory/MultiMemoryKill.java   |   0
 .../nodes/memory/OnHeapMemoryAccess.java      |   0
 .../nodes/memory/OrderedMemoryAccess.java     |   0
 .../compiler/graal/nodes/memory/ReadNode.java |   0
 .../nodes/memory/SideEffectFreeWriteNode.java |   0
 .../graal/nodes/memory/SingleMemoryKill.java  |   0
 .../graal/nodes/memory/WriteNode.java         |   0
 .../nodes/memory/address/AddressNode.java     |   0
 .../memory/address/IndexAddressNode.java      |   0
 .../memory/address/OffsetAddressNode.java     |   0
 .../nodes/spi/ArithmeticLIRLowerable.java     |   0
 .../graal/nodes/spi/ArrayLengthProvider.java  |   0
 .../graal/nodes/spi/Canonicalizable.java      |   0
 .../graal/nodes/spi/CanonicalizerTool.java    |   0
 .../graal/nodes/spi/CoreProviders.java        |   0
 .../nodes/spi/CoreProvidersDelegate.java      |   0
 .../nodes/spi/DelegatingReplacements.java     |   0
 .../graal/nodes/spi/LIRLowerable.java         |   0
 .../graal/nodes/spi/LimitedValueProxy.java    |   0
 .../graal/nodes/spi/LoopsDataProvider.java    |   0
 .../compiler/graal/nodes/spi/Lowerable.java   |   0
 .../graal/nodes/spi/LoweringProvider.java     |   0
 .../graal/nodes/spi/LoweringTool.java         |   0
 .../graal/nodes/spi/MemoryEdgeProxy.java      |   0
 .../graal/nodes/spi/NodeLIRBuilderTool.java   |   0
 .../graal/nodes/spi/NodeValueMap.java         |   0
 .../graal/nodes/spi/NodeWithState.java        |   0
 .../spi/PlatformConfigurationProvider.java    |   0
 .../graal/nodes/spi/ProfileProvider.java      |   0
 .../jdk/compiler/graal/nodes/spi/Proxy.java   |   0
 .../graal/nodes/spi/Replacements.java         |   0
 .../ResolvedJavaMethodProfileProvider.java    |   0
 .../graal/nodes/spi/Simplifiable.java         |   0
 .../graal/nodes/spi/SimplifierTool.java       |   0
 .../graal/nodes/spi/SnippetParameterInfo.java |   0
 .../nodes/spi/StableProfileProvider.java      |   0
 .../graal/nodes/spi/StampInverter.java        |   0
 .../graal/nodes/spi/StampProvider.java        |   0
 .../graal/nodes/spi/SwitchFoldable.java       |   0
 .../nodes/spi/UncheckedInterfaceProvider.java |   0
 .../compiler/graal/nodes/spi/ValueProxy.java  |   0
 .../graal/nodes/spi/Virtualizable.java        |   0
 .../nodes/spi/VirtualizableAllocation.java    |   0
 .../graal/nodes/spi/VirtualizerTool.java      |   0
 .../graal/nodes/spi/WordVerification.java     |   0
 .../graal/nodes/type/NarrowOopStamp.java      |   0
 .../compiler/graal/nodes/type/StampTool.java  |   0
 .../graal/nodes/util/ConstantFoldUtil.java    |   0
 .../nodes/util/ConstantReflectionUtil.java    |   0
 .../compiler/graal/nodes/util/GraphUtil.java  |   0
 .../graal/nodes/util/IntegerHelper.java       |   0
 .../nodes/util/JavaConstantFormattable.java   |   0
 .../nodes/util/JavaConstantFormatter.java     |   0
 .../graal/nodes/util/SignedIntegerHelper.java |   0
 .../nodes/util/UnsignedIntegerHelper.java     |   0
 .../nodes/virtual/AllocatedObjectNode.java    |   0
 .../nodes/virtual/CommitAllocationNode.java   |   0
 .../nodes/virtual/EnsureVirtualizedNode.java  |   0
 .../nodes/virtual/EscapeObjectState.java      |   0
 .../graal/nodes/virtual/LockState.java        |   0
 .../virtual/MaterializedObjectState.java      |   0
 .../graal/nodes/virtual/VirtualArrayNode.java |   0
 .../nodes/virtual/VirtualBoxingNode.java      |   0
 .../nodes/virtual/VirtualInstanceNode.java    |   0
 .../nodes/virtual/VirtualObjectNode.java      |   0
 .../nodes/virtual/VirtualObjectState.java     |   0
 .../graal/options/EnumMultiOptionKey.java     |   0
 .../compiler/graal/options/EnumOptionKey.java |   0
 .../ExcludeFromJacocoGeneratedReport.java     |   0
 .../ExcludeFromJacocoInstrumentation.java     |   0
 .../graal/options/ModifiableOptionValues.java |   0
 .../graal/options/NestedBooleanOptionKey.java |   0
 .../jdk/compiler/graal/options/OWNERS.toml    |   0
 .../jdk/compiler/graal/options/Option.java    |   0
 .../graal/options/OptionDescriptor.java       |   0
 .../graal/options/OptionDescriptors.java      |   0
 .../graal/options/OptionDescriptorsMap.java   |   0
 .../compiler/graal/options/OptionGroup.java   |   0
 .../jdk/compiler/graal/options/OptionKey.java |   0
 .../graal/options/OptionStability.java        |   0
 .../compiler/graal/options/OptionType.java    |   0
 .../compiler/graal/options/OptionValues.java  |   0
 .../compiler/graal/options/OptionsParser.java |   2 +-
 .../jdk/compiler/graal/phases/BasePhase.java  |   0
 .../graal/phases/ClassTypeSequence.java       |   0
 .../graal/phases/FloatingGuardPhase.java      |   0
 .../jdk/compiler/graal/phases/LazyName.java   |   0
 .../graal/phases/OptimisticOptimizations.java |   0
 .../src/jdk/compiler/graal/phases/Phase.java  |   0
 .../jdk/compiler/graal/phases/PhaseSuite.java |   0
 .../graal/phases/PlaceholderPhase.java        |   0
 .../graal/phases/SingleRunSubphase.java       |   0
 .../compiler/graal/phases/Speculative.java    |   0
 .../compiler/graal/phases/VerifyPhase.java    |   0
 .../phases/common/AbstractInliningPhase.java  |   0
 .../common/AddressLoweringByNodePhase.java    |   0
 .../common/AddressLoweringByUsePhase.java     |   0
 .../phases/common/AddressLoweringPhase.java   |   0
 .../common/BarrierSetVerificationPhase.java   |   0
 .../phases/common/BoxNodeIdentityPhase.java   |   0
 .../common/BoxNodeOptimizationPhase.java      |   0
 .../phases/common/CanonicalizerPhase.java     |   0
 .../common/ConditionalEliminationPhase.java   |   0
 .../common/ConditionalEliminationUtil.java    |   0
 .../common/DeadCodeEliminationPhase.java      |   0
 .../common/DeoptimizationGroupingPhase.java   |   0
 .../DisableOverflownCountedLoopsPhase.java    |   0
 ...minatorBasedGlobalValueNumberingPhase.java |   0
 .../graal/phases/common/ExpandLogicPhase.java |   0
 .../common/FinalCanonicalizerPhase.java       |   0
 .../graal/phases/common/FixReadsPhase.java    |   0
 .../phases/common/FloatingReadPhase.java      |   0
 .../common/FrameStateAssignmentPhase.java     |   0
 .../phases/common/GuardLoweringPhase.java     |   0
 .../phases/common/HighTierLoweringPhase.java  |   0
 .../common/IncrementalCanonicalizerPhase.java |   0
 .../phases/common/InsertGuardFencesPhase.java |   0
 .../IterativeConditionalEliminationPhase.java |   0
 .../graal/phases/common/LazyValue.java        |   0
 .../phases/common/LockEliminationPhase.java   |   0
 .../common/LoopSafepointInsertionPhase.java   |   0
 .../phases/common/LowTierLoweringPhase.java   |   0
 .../graal/phases/common/LoweringPhase.java    |   0
 .../phases/common/MidTierLoweringPhase.java   |   0
 .../graal/phases/common/OptimizeDivPhase.java |   0
 .../phases/common/OptimizeExtendsPhase.java   |   0
 .../common/PostRunCanonicalizationPhase.java  |   0
 .../common/ProfileCompiledMethodsPhase.java   |   0
 .../PropagateDeoptimizeProbabilityPhase.java  |   0
 .../RawConditionalEliminationPhase.java       |   0
 .../phases/common/ReassociationPhase.java     |   0
 .../phases/common/RemoveValueProxyPhase.java  |   0
 .../common/SnippetFrameStateAssignment.java   |   0
 .../common/UseTrappingNullChecksPhase.java    |   0
 .../common/UseTrappingOperationPhase.java     |   0
 .../common/VerifyHeapAtReturnPhase.java       |   0
 .../common/WriteBarrierAdditionPhase.java     |   0
 .../phases/common/inlining/InliningPhase.java |   0
 .../phases/common/inlining/InliningUtil.java  |   0
 .../inlining/info/AbstractInlineInfo.java     |   0
 .../inlining/info/AssumptionInlineInfo.java   |   0
 .../common/inlining/info/ExactInlineInfo.java |   0
 .../common/inlining/info/InlineInfo.java      |   0
 .../info/MultiTypeGuardInlineInfo.java        |   0
 .../inlining/info/TypeGuardInlineInfo.java    |   0
 .../common/inlining/info/elem/Inlineable.java |   0
 .../inlining/info/elem/InlineableGraph.java   |   0
 .../policy/AbstractInliningPolicy.java        |   0
 .../inlining/policy/GreedyInliningPolicy.java |   0
 .../policy/InlineEverythingPolicy.java        |   0
 .../InlineMethodSubstitutionsPolicy.java      |   0
 .../inlining/policy/InliningPolicy.java       |   0
 .../inlining/walker/CallsiteHolder.java       |   0
 .../walker/CallsiteHolderExplorable.java      |   0
 .../walker/ComputeInliningRelevance.java      |   0
 .../common/inlining/walker/InliningData.java  |   0
 .../inlining/walker/InliningIterator.java     |   0
 .../inlining/walker/MethodInvocation.java     |   0
 .../util/EconomicSetNodeEventListener.java    |   0
 .../graal/phases/common/util/LoopUtility.java |   0
 .../common/util/OptimizationUtility.java      |   0
 .../graal/phases/contract/NodeCostUtil.java   |   0
 .../phases/contract/PhaseSizeContract.java    |   0
 .../phases/contract/VerifyNodeCosts.java      |   0
 .../FixedNodeRelativeFrequencyCache.java      |   0
 .../graal/phases/graph/MergeableState.java    |   0
 .../phases/graph/PostOrderNodeIterator.java   |   0
 .../phases/graph/ReentrantBlockIterator.java  |   0
 .../phases/graph/ReentrantNodeIterator.java   |   0
 .../phases/graph/ScheduledNodeIterator.java   |   0
 .../graph/StatelessPostOrderNodeIterator.java |   0
 .../graal/phases/graph/package-info.java      |   0
 .../compiler/graal/phases/package-info.java   |   0
 .../graal/phases/schedule/BlockClosure.java   |   0
 .../graal/phases/schedule/SchedulePhase.java  |   0
 .../phases/schedule/ScheduleVerification.java |   0
 .../phases/tiers/CompilerConfiguration.java   |   0
 .../graal/phases/tiers/HighTierContext.java   |   0
 .../graal/phases/tiers/LowTierContext.java    |   0
 .../graal/phases/tiers/MidTierContext.java    |   0
 .../compiler/graal/phases/tiers/Suites.java   |   0
 .../graal/phases/tiers/SuitesCreator.java     |   0
 .../graal/phases/tiers/SuitesProvider.java    |   0
 .../graal/phases/tiers/TargetProvider.java    |   0
 .../graal/phases/util/GraphOrder.java         |   0
 .../compiler/graal/phases/util/Providers.java |   0
 .../graal/phases/util/ValueMergeUtil.java     |   0
 .../printer/BciBlockMappingDumpHandler.java   |   0
 .../graal/printer/BinaryGraphPrinter.java     |   0
 .../compiler/graal/printer/CFGPrinter.java    |   0
 .../graal/printer/CFGPrinterObserver.java     |   0
 .../printer/CanonicalStringGraphPrinter.java  |   0
 .../graal/printer/CompilationPrinter.java     |   0
 .../printer/GraalDebugHandlersFactory.java    |   0
 .../compiler/graal/printer/GraphPrinter.java  |   0
 .../printer/GraphPrinterDumpHandler.java      |   0
 .../printer/NoDeadCodeVerifyHandler.java      |   0
 .../replacements/AllocationSnippets.java      |   0
 .../replacements/BigIntegerSnippets.java      |   0
 .../graal/replacements/BoxingSnippets.java    |   0
 .../replacements/CachingPEGraphDecoder.java   |   0
 .../ConstantBindingParameterPlugin.java       |   0
 .../DefaultJavaLoweringProvider.java          |   0
 .../graal/replacements/DimensionsNode.java    |   0
 .../compiler/graal/replacements/GraphKit.java |   0
 .../IdentityHashCodeSnippets.java             |   0
 .../InlineDuringParsingPlugin.java            |   0
 .../InstanceOfSnippetsTemplates.java          |   0
 .../replacements/IntrinsicGraphBuilder.java   |   0
 .../replacements/InvocationPluginHelper.java  |   0
 .../graal/replacements/IsArraySnippets.java   |   0
 .../compiler/graal/replacements/JavacBug.java |   0
 .../replacements/MethodHandlePlugin.java      |   0
 .../MethodHandleWithExceptionPlugin.java      |   0
 .../NodeIntrinsificationProvider.java         |   0
 .../graal/replacements/NodeStrideUtil.java    |   0
 .../replacements/NonNullParameterPlugin.java  |   0
 .../graal/replacements/PEGraphDecoder.java    |   0
 .../PartialIntrinsicCallTargetNode.java       |   0
 .../graal/replacements/ReplacementsImpl.java  |   0
 .../graal/replacements/ReplacementsUtil.java  |   0
 .../graal/replacements/SnippetCounter.java    |   0
 .../replacements/SnippetCounterNode.java      |   0
 .../replacements/SnippetIntegerHistogram.java |   0
 .../SnippetSubstitutionInvocationPlugin.java  |   0
 .../replacements/SnippetSubstitutionNode.java |   0
 .../graal/replacements/SnippetTemplate.java   |   0
 .../compiler/graal/replacements/Snippets.java |   0
 .../StandardGraphBuilderPlugins.java          |   0
 .../replacements/StringHelperIntrinsics.java  |   0
 .../replacements/StringLatin1InflateNode.java |   0
 .../replacements/StringLatin1Snippets.java    |   0
 .../replacements/StringUTF16CompressNode.java |   0
 .../replacements/StringUTF16Snippets.java     |   0
 .../TargetGraphBuilderPlugins.java            |   0
 .../aarch64/AArch64BitCountNode.java          |   0
 .../aarch64/AArch64GraphBuilderPlugins.java   |   0
 .../AArch64IntegerArithmeticSnippets.java     |   0
 .../amd64/AMD64ConvertSnippets.java           |   0
 .../amd64/AMD64FloatConvertNode.java          |   0
 .../amd64/AMD64GraphBuilderPlugins.java       |   0
 .../amd64/AMD64IntrinsicStubs.java            |   0
 .../arraycopy/ArrayCopyCallNode.java          |   0
 .../arraycopy/ArrayCopyForeignCalls.java      |   0
 .../arraycopy/ArrayCopyLookup.java            |   0
 .../replacements/arraycopy/ArrayCopyNode.java |   0
 .../arraycopy/ArrayCopySnippets.java          |   0
 .../ArrayCopyWithDelayedLoweringNode.java     |   0
 .../replacements/classfile/Classfile.java     |   0
 .../classfile/ClassfileBytecode.java          |   0
 .../classfile/ClassfileBytecodeProvider.java  |   0
 .../classfile/ClassfileConstant.java          |   0
 .../classfile/ClassfileConstantPool.java      |   0
 .../classfile/ConstantPoolPatch.java          |   0
 .../gc/G1WriteBarrierSnippets.java            |   0
 .../gc/SerialWriteBarrierSnippets.java        |   0
 .../replacements/gc/WriteBarrierSnippets.java |   0
 .../graal/replacements/nodes/AESNode.java     |   0
 .../nodes/ArrayCompareToForeignCalls.java     |   0
 .../nodes/ArrayCompareToNode.java             |   0
 .../ArrayCopyWithConversionsForeignCalls.java |   0
 .../nodes/ArrayCopyWithConversionsNode.java   |   0
 .../nodes/ArrayEqualsForeignCalls.java        |   0
 .../replacements/nodes/ArrayEqualsNode.java   |   0
 .../ArrayEqualsWithMaskForeignCalls.java      |   0
 .../nodes/ArrayIndexOfForeignCalls.java       |   0
 .../nodes/ArrayIndexOfMacroNode.java          |   0
 .../replacements/nodes/ArrayIndexOfNode.java  |   0
 .../ArrayRegionCompareToForeignCalls.java     |   0
 .../nodes/ArrayRegionCompareToNode.java       |   0
 .../nodes/ArrayRegionEqualsNode.java          |   0
 .../nodes/ArrayRegionEqualsWithMaskNode.java  |   0
 .../replacements/nodes/AssertionNode.java     |   0
 .../nodes/BasicArrayCopyNode.java             |   0
 .../nodes/BasicObjectCloneNode.java           |   0
 .../nodes/BigIntegerMulAddNode.java           |   0
 .../nodes/BigIntegerMultiplyToLenNode.java    |   0
 .../nodes/BigIntegerSquareToLenNode.java      |   0
 .../nodes/BinaryMathIntrinsicNode.java        |   0
 .../replacements/nodes/BitCountNode.java      |   0
 .../nodes/BitScanForwardNode.java             |   0
 .../nodes/BitScanReverseNode.java             |   0
 .../replacements/nodes/CStringConstant.java   |   0
 .../CalcStringAttributesForeignCalls.java     |   0
 .../nodes/CalcStringAttributesMacroNode.java  |   0
 .../nodes/CalcStringAttributesNode.java       |   0
 .../nodes/CipherBlockChainingAESNode.java     |   0
 .../nodes/CountLeadingZerosNode.java          |   0
 .../nodes/CountPositivesNode.java             |   0
 .../nodes/CountTrailingZerosNode.java         |   0
 .../nodes/CounterModeAESNode.java             |   0
 .../replacements/nodes/EncodeArrayNode.java   |   0
 .../replacements/nodes/ExplodeLoopNode.java   |   0
 .../FallbackInvokeWithExceptionNode.java      |   0
 .../nodes/FloatToHalfFloatNode.java           |   0
 .../replacements/nodes/ForeignCalls.java      |   0
 .../nodes/FusedMultiplyAddNode.java           |   0
 .../nodes/GHASHProcessBlocksNode.java         |   0
 .../nodes/HalfFloatToFloatNode.java           |   0
 .../nodes/IdentityHashCodeNode.java           |   0
 .../nodes/IntrinsicMethodNodeInterface.java   |   0
 .../nodes/LoadSnippetVarargParameterNode.java |   0
 .../graal/replacements/nodes/LogNode.java     |   0
 .../replacements/nodes/MacroInvokable.java    |   0
 .../graal/replacements/nodes/MacroNode.java   |   0
 .../nodes/MacroWithExceptionNode.java         |   0
 .../nodes/MemoryKillStubIntrinsicNode.java    |   0
 .../replacements/nodes/MessageDigestNode.java |   0
 .../replacements/nodes/MethodHandleNode.java  |   0
 .../nodes/MethodHandleWithExceptionNode.java  |   0
 .../graal/replacements/nodes/ObjectClone.java |   0
 .../nodes/ProfileBooleanNode.java             |   0
 .../nodes/PureFunctionMacroNode.java          |   0
 .../nodes/PureFunctionStubIntrinsicNode.java  |   0
 .../replacements/nodes/ReadRegisterNode.java  |   0
 .../nodes/ReflectionGetCallerClassNode.java   |   0
 .../ResolvedMethodHandleCallTargetNode.java   |   0
 .../replacements/nodes/ReverseBitsNode.java   |   0
 .../replacements/nodes/ReverseBytesNode.java  |   0
 .../nodes/UnaryMathIntrinsicNode.java         |   0
 .../nodes/VectorizedHashCodeNode.java         |   0
 .../nodes/VectorizedMismatchNode.java         |   0
 .../nodes/VirtualizableInvokeMacroNode.java   |   0
 .../replacements/nodes/WriteRegisterNode.java |   0
 .../replacements/nodes/ZeroMemoryNode.java    |   0
 ...BinaryIntegerExactArithmeticSplitNode.java |   0
 .../nodes/arithmetic/IntegerAddExactNode.java |   0
 .../IntegerAddExactOverflowNode.java          |   0
 .../arithmetic/IntegerAddExactSplitNode.java  |   0
 .../IntegerExactArithmeticNode.java           |   0
 .../IntegerExactArithmeticSplitNode.java      |   0
 .../arithmetic/IntegerExactOverflowNode.java  |   0
 .../nodes/arithmetic/IntegerMulExactNode.java |   0
 .../IntegerMulExactOverflowNode.java          |   0
 .../arithmetic/IntegerMulExactSplitNode.java  |   0
 .../nodes/arithmetic/IntegerNegExactNode.java |   0
 .../IntegerNegExactOverflowNode.java          |   0
 .../arithmetic/IntegerNegExactSplitNode.java  |   0
 .../nodes/arithmetic/IntegerSubExactNode.java |   0
 .../IntegerSubExactOverflowNode.java          |   0
 .../arithmetic/IntegerSubExactSplitNode.java  |   0
 .../nodes/arithmetic/UnsignedMulHighNode.java |   0
 .../graal/runtime/RuntimeProvider.java        |   0
 .../serviceprovider/GlobalAtomicLong.java     |   0
 .../graal/serviceprovider/GraalServices.java  |   4 +-
 .../serviceprovider/GraalUnsafeAccess.java    |   0
 .../graal/serviceprovider/IsolateUtil.java    |   0
 .../graal/serviceprovider/JMXService.java     |   0
 .../serviceprovider/JavaVersionUtil.java      |   0
 .../graal/serviceprovider/OWNERS.toml         |   0
 .../serviceprovider/ServiceProvider.java      |   0
 .../SpeculationEncodingAdapter.java           |   0
 .../SpeculationReasonGroup.java               |   0
 .../UnencodedSpeculationReason.java           |   0
 .../jdk/compiler/graal/truffle/OWNERS.toml    |   0
 .../compiler/AbstractKnownTruffleTypes.java   |   0
 .../AbstractTruffleCompilationSupport.java    |   0
 ...ommunityPartialEvaluatorConfiguration.java |   0
 .../EconomyPartialEvaluatorConfiguration.java |   0
 .../truffle/compiler/ExpansionStatistics.java |   0
 .../compiler/GraphTooBigBailoutException.java |   0
 .../truffle/compiler/KnownTruffleTypes.java   |   0
 .../PEAgnosticInlineInvokePlugin.java         |   0
 .../compiler/ParsingInlineInvokePlugin.java   |   0
 .../truffle/compiler/PartialEvaluator.java    |   0
 .../PartialEvaluatorConfiguration.java        |   0
 .../PerformanceInformationHandler.java        |   0
 .../compiler/PostPartialEvaluationSuite.java  |   0
 .../truffle/compiler/SuppressFBWarnings.java  |   0
 .../graal/truffle/compiler/TruffleAST.java    |   0
 .../truffle/compiler/TruffleCompilation.java  |   0
 .../TruffleCompilationIdentifier.java         |   0
 .../TruffleCompilerConfiguration.java         |   0
 .../truffle/compiler/TruffleCompilerImpl.java |   0
 .../compiler/TruffleCompilerOptions.java      |   0
 .../TruffleConstantFieldProvider.java         |   0
 .../compiler/TruffleDebugHandlersFactory.java |   0
 .../compiler/TruffleDebugJavaMethod.java      |   0
 .../truffle/compiler/TruffleElementCache.java |   0
 .../compiler/TruffleInliningScope.java        |   0
 .../TruffleStringConstantFieldProvider.java   |   0
 .../compiler/TruffleTierConfiguration.java    |   0
 .../truffle/compiler/TruffleTierContext.java  |   0
 .../compiler/host/HostInliningPhase.java      |   0
 .../host/InjectImmutableFrameFieldsPhase.java |   0
 .../compiler/host/TruffleHostEnvironment.java |   0
 .../compiler/host/TruffleKnownHostTypes.java  |   0
 .../hotspot/HotSpotKnownTruffleTypes.java     |   0
 .../hotspot/HotSpotPartialEvaluator.java      |   0
 .../HotSpotTruffleCompilationIdentifier.java  |   0
 .../HotSpotTruffleCompilationSupport.java     |   0
 .../hotspot/HotSpotTruffleCompilerImpl.java   |   0
 .../HotSpotTruffleGraphBuilderPlugins.java    |   0
 .../HotSpotTruffleHostEnvironment.java        |   0
 .../HotSpotTruffleHostEnvironmentLookup.java  |   0
 .../HotSpotTruffleLoweringExtensions.java     |   0
 ...otSpotTruffleSafepointLoweringSnippet.java |   0
 ...fleCallBoundaryInstrumentationFactory.java |   0
 ...TruffleCommunityCompilerConfiguration.java |   0
 ...CommunityCompilerConfigurationFactory.java |   0
 .../hotspot/TruffleEntryPointDecorator.java   |   0
 ...fleCallBoundaryInstrumentationFactory.java |   0
 ...fleCallBoundaryInstrumentationFactory.java |   0
 .../truffle/compiler/nodes/AnyExtendNode.java |   0
 .../nodes/IsCompilationConstantNode.java      |   0
 .../nodes/ObjectLocationIdentity.java         |   0
 .../nodes/SpeculativeExceptionAnchorNode.java |   0
 .../compiler/nodes/TruffleAssumption.java     |   0
 .../compiler/nodes/TruffleSafepointNode.java  |   0
 .../asserts/NeverPartOfCompilationNode.java   |   0
 .../nodes/frame/AllowMaterializeNode.java     |   0
 .../nodes/frame/ForceMaterializeNode.java     |   0
 .../compiler/nodes/frame/NewFrameNode.java    |   0
 .../nodes/frame/VirtualFrameAccessFlags.java  |   0
 .../nodes/frame/VirtualFrameAccessType.java   |   0
 .../VirtualFrameAccessVerificationNode.java   |   0
 .../nodes/frame/VirtualFrameAccessorNode.java |   0
 .../nodes/frame/VirtualFrameClearNode.java    |   0
 .../nodes/frame/VirtualFrameCopyNode.java     |   0
 .../nodes/frame/VirtualFrameGetNode.java      |   0
 .../nodes/frame/VirtualFrameGetTagNode.java   |   0
 .../nodes/frame/VirtualFrameIsNode.java       |   0
 .../nodes/frame/VirtualFrameSetNode.java      |   0
 .../nodes/frame/VirtualFrameSwapNode.java     |   0
 .../phases/DeoptimizeOnExceptionPhase.java    |   0
 .../phases/FrameAccessVerificationPhase.java  |   0
 .../InliningAcrossTruffleBoundaryPhase.java   |   0
 .../phases/InstrumentBranchesPhase.java       |   0
 .../compiler/phases/InstrumentPhase.java      |   0
 .../InstrumentTruffleBoundariesPhase.java     |   0
 .../compiler/phases/InstrumentationSuite.java |   0
 .../phases/MaterializeFramesPhase.java        |   0
 .../phases/NeverPartOfCompilationPhase.java   |   0
 .../compiler/phases/PhiTransformPhase.java    |   0
 .../ReportPerformanceWarningsPhase.java       |   0
 .../phases/SetIdentityForValueTypesPhase.java |   0
 .../phases/TruffleCompilerPhases.java         |   0
 .../TruffleLoopSafepointEliminationPhase.java |   0
 .../TruffleSafepointInsertionPhase.java       |   0
 .../truffle/compiler/phases/TruffleTier.java  |   0
 .../phases/VerifyFrameDoesNotEscapePhase.java |   0
 .../inlining/AgnosticInliningPhase.java       |   0
 .../compiler/phases/inlining/CallNode.java    |   0
 .../compiler/phases/inlining/CallTree.java    |   0
 .../inlining/DefaultInliningPolicy.java       |   0
 .../DefaultInliningPolicyProvider.java        |   0
 .../phases/inlining/GraphManager.java         |   0
 .../phases/inlining/InliningPolicy.java       |   0
 .../inlining/InliningPolicyProvider.java      |   0
 .../phases/inlining/NoInliningPolicy.java     |   0
 .../inlining/NoInliningPolicyProvider.java    |   0
 .../inlining/TrivialOnlyInliningPolicy.java   |   0
 .../inlining/TrivialOnlyPolicyProvider.java   |   0
 .../GraphBuilderInvocationPluginProvider.java |   0
 .../GraphDecoderInvocationPluginProvider.java |   0
 .../TruffleGraphBuilderPlugins.java           |   0
 .../TruffleInvocationPlugins.java             |   0
 .../compiler/graal/util/CollectionsUtil.java  |   0
 .../compiler/graal/util/OptionsEncoder.java   |   0
 .../graal/util/TypedDataInputStream.java      |   0
 .../graal/util/TypedDataOutputStream.java     |   0
 .../graal/util/json/JSONFormatter.java        |   0
 .../compiler/graal/util/json/JSONParser.java  |   0
 .../graal/util/json/JSONParserException.java  |   0
 .../graal/virtual/phases/ea/EffectList.java   |   0
 .../virtual/phases/ea/EffectsBlockState.java  |   0
 .../virtual/phases/ea/EffectsClosure.java     |   0
 .../graal/virtual/phases/ea/EffectsPhase.java |   0
 .../phases/ea/FinalPartialEscapePhase.java    |   0
 .../virtual/phases/ea/GraphEffectList.java    |   0
 .../graal/virtual/phases/ea/ObjectState.java  |   0
 .../ea/PEReadEliminationBlockState.java       |   0
 .../phases/ea/PEReadEliminationClosure.java   |   0
 .../phases/ea/PartialEscapeBlockState.java    |   0
 .../phases/ea/PartialEscapeClosure.java       |   0
 .../virtual/phases/ea/PartialEscapePhase.java |   0
 .../phases/ea/ReadEliminationBlockState.java  |   0
 .../phases/ea/ReadEliminationClosure.java     |   0
 .../phases/ea/ReadEliminationPhase.java       |   0
 .../graal/virtual/phases/ea/VirtualUtil.java  |   0
 .../phases/ea/VirtualizerToolImpl.java        |   0
 .../compiler/graal/word/BarrieredAccess.java  |   0
 .../jdk/compiler/graal/word/ObjectAccess.java |   0
 .../src/jdk/compiler/graal/word/Word.java     |   0
 .../jdk/compiler/graal/word/WordCastNode.java |   0
 .../graal/word/WordOperationPlugin.java       |   0
 .../jdk/compiler/graal/word/WordTypes.java    |   0
 .../graal/word/WordVerificationImpl.java      |   0
 docs/reference-manual/java/compiler.md        |   4 +-
 .../native-image/BuildOutput.md               |   2 +-
 sdk/mx.sdk/mx_sdk_vm.py                       |   2 +-
 sdk/mx.sdk/mx_sdk_vm_impl.py                  |   2 +-
 sdk/mx.sdk/suite.py                           |   2 +-
 .../ModuleSystemSupportHosted.md              |   2 +-
 substratevm/mx.substratevm/mx_substratevm.py  |  12 +-
 substratevm/mx.substratevm/suite.py           |  30 +-
 .../StandaloneConstantScanDynamicTest.java    |   2 +-
 .../pointsto/standalone/PointsToAnalyzer.java |   4 +-
 .../oracle/svm/driver/APIOptionHandler.java   |   2 +-
 .../com/oracle/svm/driver/NativeImage.java    |   2 +-
 .../hotspot/libgraal/LibGraalFeature.java     |   4 +-
 .../hosted/NativeImageClassLoaderSupport.java |   2 +-
 .../hosted/NativeImageGeneratorRunner.java    |   7 +-
 .../svm/hosted/image/sources/SourceCache.java |   2 +-
 .../phases/AnalysisGraphBuilderPhase.java     |   2 +-
 .../com/oracle/svm/junit/JUnitFeature.java    |   2 +-
 .../svm/polyglot/scala/ScalaFeature.java      |   2 +-
 .../native-image/native-image.properties      |  12 +-
 truffle/docs/HostCompilation.md               |   2 +-
 truffle/docs/Inlining.md                      |   2 +-
 truffle/mx.truffle/suite.py                   |  10 +-
 .../api/dsl/test/ObjectSizeEstimate.java      |   4 -
 .../runtime/OptimizedTruffleRuntime.java      |   8 +-
 .../hotspot/HotSpotTruffleRuntimeAccess.java  |   5 +-
 vm/mx.vm/mx_vm_gate.py                        |   2 +-
 3433 files changed, 125 insertions(+), 710 deletions(-)
 delete mode 100644 compiler/mx.compiler/mx_renamegraalpackages.py
 delete mode 100644 compiler/mx.compiler/mx_updategraalinopenjdk.py
 rename compiler/src/{org.graalvm.compiler.hotspot.jdk21.test => jdk.compiler.graal.hotspot.jdk21.test}/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java (100%)
 rename compiler/src/{org.graalvm.compiler.hotspot.jdk21.test => jdk.compiler.graal.hotspot.jdk21.test}/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java (100%)
 rename compiler/src/{org.graalvm.compiler.management => jdk.compiler.graal.management}/src/jdk/compiler/graal/management/JMXServiceProvider.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java (95%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java (100%)
 rename compiler/src/{org.graalvm.compiler.microbenchmarks => jdk.compiler.graal.microbenchmarks}/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/META-INF/services/javax.annotation.processing.Processor (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/options/processor/OptionProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/processor/AbstractProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/processor/SuppressFBWarnings.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/FoldHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.processor => jdk.compiler.graal.processor}/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/test/ExportingClassLoader.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/test/Graal.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/test/GraalAPITest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/api/test/ModuleSupport.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/asm/test/AssemblerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/AllocSpy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/BoxingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ByteBufferTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java (99%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CompilationResultTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CountedLoopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CountedLoopTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DumpPathTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/DynamicConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/EarlyGVNTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/EnumSwitchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/EnumValuesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FloatingDivTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FloatingReadTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FuzzTest36456.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/FuzzTest36457.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraalCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java (98%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraphDumpingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraphEncoderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraphPrinterTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraphScheduleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/HashCodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IfReorderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/InfopointReasonTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/InvokeHintsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/IsArrayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/LockEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/LongNodeChainTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MatchRuleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MathSignumStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MonitorGraphTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/MulNegateTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NarrowingReadTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NestedLoopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NewInstanceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/NodePropertiesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/PhiCreationTests.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/PushThroughIfTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReassociationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SchedulingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SchedulingTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SimpleCFGTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SpectreFenceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/StraighteningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubWordInputTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubWordInputTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubWordReturnTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubWordTestUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SubprocessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/SwitchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TestAutoboxConf.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TestBasePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TestPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TypeSystemTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/TypeWriterTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnsignedLongTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/UnusedArray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/backend/BackendTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/EATestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/inlining/InliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/CSVUtilTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/DebugContextTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/GraalErrorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/LogStreamTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/TTYTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/TimerKeyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/debug/test/VersionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/GraphTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeInputListTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeMapTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/TestNodeInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java (99%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/GCStressTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java (98%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/JTTTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_land.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_new.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_aaload0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_aaload1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_aastore0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_aastore1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_anewarray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_arraylength.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_athrow0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_athrow1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_athrow2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_athrow3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_baload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_bastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_caload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_castore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_daload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_dastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_faload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_fastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_getfield.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_getfield1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_iaload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_iastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_idiv.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_idiv2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_irem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_laload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_lastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_ldiv.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_lrem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_newarray.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_putfield.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_saload.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/BC_sastore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Two01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Two02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Two03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Except_Locals.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Finally01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Finally02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_InNested.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_count.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_life.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_series.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/Class_getName.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/LongBits.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/ShortBits.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/System_setOut.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_cast01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_cast02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_forName01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_forName02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_forName03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_forName04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_forName05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getName01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getName02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Double_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Double_conditional.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Double_toString.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Float_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Float_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Float_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Float_conditional.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_greater01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_greater02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_greater03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_less01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_less02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_less03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_greater01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_greater02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_greater03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_less01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_less02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_less03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_abs.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_copySign.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_cos.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_exact.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_exp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_log.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_log10.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_minMax.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_pow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_round.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_signum.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_sin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Math_tan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_clone01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_clone02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_equals01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_notify01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_notify02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_toString01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_toString02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_wait01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_wait02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/Object_wait03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/String_intern01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/String_intern02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/String_intern03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/lang/UnaryMath.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop07.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop07_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop08.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop09.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop09_2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop11.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop12.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop13.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop14.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop15.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/Loop17.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopEscape.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopInline.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopPhi.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/Bubblesort.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/Fibonacci.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/FloatingReads.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/Matrix01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/String_format01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/String_format02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Cmov01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Cmov02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Conditional01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Inline01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Inline02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/LLE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Logic0.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Phi01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Phi02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Phi03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Switch01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/Switch02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_get01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_get02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_get03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_set01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_set02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_set03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_get01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_get02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_get03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_get04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_set01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_set02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Field_set03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Object_wait01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Object_wait02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Object_wait03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Object_wait04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_join01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_join02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_join03.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_new01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_new02.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/jtt/LIRTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/loop/test/LoopsDataTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/AddNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/FloatStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/GraphStateTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/InliningLogTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/NarrowTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/StampInverterTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/StampToolTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/options/test/TestOptionKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/EdgesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/InvokeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/MathRoundTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/MonitorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/NewArrayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/PointerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/SnippetsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/VarHandleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/WordTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/AddExports.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/AddJVM.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/AddModules.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/CommandLine.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/CountUppercase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/GraalTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/test/SubprocessUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AddExports.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/EngineModeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ExactMathTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/GR35581Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/GR36613Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/HostInliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LoomUtils.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/util/test/AddModulesTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/util/test/CollectionSizeTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/util/test/CollectionUtilTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/util/test/JSONParserTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java (99%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/sl/TestCompilationThreshold.sl (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/sl/TestDeoptInInlinedFunction.output (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/sl/TestOSR.sl (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/sl/TestTruffleBoundary01.sl (100%)
 rename compiler/src/{jdk.internal.vm.compiler.test => jdk.compiler.graal.test}/src/sl/disabled/TestIsCompilationConstant1.sl (100%)
 rename compiler/src/{org.graalvm.compiler.truffle.test.jdk21 => jdk.compiler.graal.truffle.test.jdk21}/src/jdk/compiler/graal/truffle/test/LoomUtils.java (100%)
 rename compiler/src/{org.graalvm.compiler.virtual.bench => jdk.compiler.graal.virtual.bench}/.checkstyle.exclude (100%)
 rename compiler/src/{org.graalvm.compiler.virtual.bench => jdk.compiler.graal.virtual.bench}/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/.checkstyle_checks.xml (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/directives/GraalDirectives.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/replacements/Fold.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/replacements/Snippet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/api/runtime/GraalRuntime.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/AbstractAddress.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/AsmOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/Assembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/Buffer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/Label.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/VectorSize.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/amd64/AMD64Address.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/asm/amd64/AVXKind.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/Bytecode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BytecodeProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BytecodeStream.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/Bytecodes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/Bytes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/OWNERS.toml (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/CompilationResult.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/DataSection.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/DisassemblerProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/HexCodeFile.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/SourceMapping.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/CompilationPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/CompilationWatchDog.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/CompilationWrapper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/CompilerThread.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/CompilerThreadFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/GraalCompiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/GraalCompilerOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/GraalServiceThread.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/Instrumentation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/LIRGenerationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/CancellationBailoutException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/CompilationIdentifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/CompilerProfiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/CompressEncoding.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/FieldIntrospection.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/Fields.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/FieldsScanner.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/GraalBailoutException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/GraalOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/LIRKind.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/LIRKindWithCast.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/NumUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/PermanentBailoutException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/RetryableBailoutException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/Stride.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/StrideUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/calc/Condition.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/calc/FloatConvert.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/BlockMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/Loop.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/memory/BarrierType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/FloatStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/IllegalStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/IntegerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/ObjectStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/Stamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/StampFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/StampPair.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/TypeReference.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/TypedConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/type/VoidStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/BitMap2D.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/EventCounter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/FieldKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/IntList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/MethodKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/PhasePlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/ReversedList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/TypeConversion.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/TypeReader.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/TypeWriter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/UnsignedLong.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/common/util/Util.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/InstructionPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/NodeMatchRules.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/gen/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/ComplexMatchResult.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/ComplexMatchValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchPattern.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchRule.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchRules.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchStatement.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchStatementSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchableNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/match/MatchableNodes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/BaseTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/CEOptimization.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/EconomyHighTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/EconomyLowTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/EconomyMidTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/HighTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/LowTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/MidTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/core/target/Backend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/AbstractKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/AccumulatedKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/Assertions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/CSVUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/CloseableCounter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/CompilationListener.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/CounterKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/CounterKeyImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugCloseable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugConfig.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugConfigImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugDumpHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugDumpScope.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugFilter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugHandlersFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DebugVerifyHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/GlobalMetrics.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/GraalError.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/IgvDumpChannel.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/Indent.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/JavaMethodContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/KeyRegistry.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/LogStream.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/MemUseTrackerKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/MethodFilter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/MetricKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/PathUtilities.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/ScopeImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/TTY.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/TTYStreamProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/TimeSource.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/TimerKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/TimerKeyImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/Versions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/Edges.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/GraalGraphError.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/Graph.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/GraphNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/InputEdges.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/IterableNodeType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/LinkedStack.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/MemoryKillMarker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/Node.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeBitMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeClass.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeFlood.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeIdAccessor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeInputList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeSourcePosition.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeStack.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeSuccessorList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeUnionFind.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeUsageIterable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeUsageIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/NodeWorkList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/Position.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/SourceLanguagePosition.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/SuccessorEdges.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/iterators/NodeIterable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/iterators/NodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/iterators/NodePredicate.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/iterators/NodePredicates.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphBlocks.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphElements.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphLocations.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphOutput.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphProtocol.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphStructure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/GraphTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/ProtocolImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/doc-files/diamond.png (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/graphio/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/Emitter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/IEmitter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/Keyword.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CompilationContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CompilationCounters.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CompilationStatistics.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CompilationTask.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/EncodedSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotBackend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/SnippetSignature.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/Log.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/Stub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/KlassPointer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/MethodPointer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/BciBlockMapping.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/BytecodeParser.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/BytecodeParserOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/DefaultSuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/FrameStateBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/GraphBuilderPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/JsrScope.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/LambdaUtils.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/LargeLocalLiveness.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/LocalLiveness.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/SmallLocalLiveness.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/StableMethodNameFormatter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/java/SuitesProviderBase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/CastValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/CompositeValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/CompositeValueClass.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ConstantValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/FullInfopointOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/GenerateStub.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/GenerateStubs.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/InstructionStateProcedure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/InstructionValueConsumer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/InstructionValueProcedure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIR.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRFrameState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRInstruction.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRInstructionClass.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRIntrospection.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LIRValueUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/LabelRef.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/NullCheckOptimizer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/Opcode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/RedundantMoveElimination.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/StandardOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/StateProcedure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/SwitchStrategy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/SyncPort.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/SyncPorts.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ValueConsumer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ValueProcedure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/Variable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/VirtualStackSlot.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/Range.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64Call.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64Move.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/asm/DataBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/asm/FrameContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/constopt/ConstantTree.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/constopt/DefUseTree.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/constopt/UseEntry.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/constopt/VariableMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/debug/IntervalDumper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/dfa/LocationMarker.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/FrameMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/LIRGenerator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/MoveFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/hashing/IntHasher.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/AllocationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/AllocationStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/LIRPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/LIRSuites.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/profiling/MoveType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ssa/SSAUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/util/GenericValueMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/util/IndexedValueMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/util/RegisterMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/util/ValueMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/lir/util/ValueSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopTransformations.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodeinfo/InputType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodeinfo/NodeCycles.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodeinfo/NodeInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodeinfo/NodeSize.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodeinfo/StructuralInput.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodeinfo/Verbosity.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractBeginNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractEndNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractLocalNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractMergeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/AbstractStateSplit.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ArithmeticOperation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/BeginNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/BreakpointNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/CallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/Cancellable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/CompressionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ConstantNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ControlSinkNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ControlSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DeadEndNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DeoptimizeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DeoptimizingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/DynamicPiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/EncodedGraph.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/EndNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/EntryMarkerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/EntryProxyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FixedGuardNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FixedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FixedNodeInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FixedWithNextNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FrameState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/FullInfopointNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GraphDecoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GraphEncoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GraphState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GuardNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GuardPhiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GuardProxyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/GuardedValueNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/IfNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/InliningLog.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/InliningLogCodec.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/Invokable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/Invoke.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/InvokeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LogicConstantNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LogicNegationNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LogicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LoopBeginNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LoopEndNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LoopExitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/MemoryProxyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/MergeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/NodeView.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/OptimizationLog.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ParameterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PauseNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PhiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PiArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PluginReplacementNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ProfileData.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ProxyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ReturnNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/SafepointNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/SpinWaitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/StartNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/StateSplit.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/StructuredGraph.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/TypeCheckHints.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/UnreachableNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/UnwindNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ValueNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ValueNodeInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ValuePhiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/ValueProxyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/VirtualState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/WithExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/AbsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/AddNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/AndNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/BinaryNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/CompareNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ConvertNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/CopySignNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/FloatingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/IsNullNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/MaxNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/MinNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/MulNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/NarrowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/NegateNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/NotNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/OrNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/RemNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/RoundNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ShiftNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SignumNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SqrtNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/SubNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/TernaryNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnaryNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/XorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/cfg/LocationSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/BoxNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/ForeignCall.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/GetClassNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/GuardedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/GuardingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/MembarNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/MonitorExit.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/SwitchNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/UnboxNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/BarrierSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/NewArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/InductionVariable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopEx.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopFragment.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopsData.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/loop/MathUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MemoryKill.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MemoryMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/ReadNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/WriteNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/CoreProviders.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/Lowerable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/LoweringTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/NodeWithState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/Proxy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/Replacements.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/Simplifiable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/StampInverter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/StampProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/ValueProxy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/Virtualizable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/spi/WordVerification.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/type/StampTool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/GraphUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/IntegerHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/LockState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/EnumMultiOptionKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/EnumOptionKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/ModifiableOptionValues.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OWNERS.toml (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/Option.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionDescriptor.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionDescriptors.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionDescriptorsMap.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionGroup.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionKey.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionStability.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionValues.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/options/OptionsParser.java (99%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/BasePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/ClassTypeSequence.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/FloatingGuardPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/LazyName.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/OptimisticOptimizations.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/Phase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/PhaseSuite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/PlaceholderPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/SingleRunSubphase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/Speculative.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/VerifyPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/FixReadsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/LazyValue.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/LoweringPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/ReassociationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/util/LoopUtility.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/MergeableState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/graph/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/package-info.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/schedule/BlockClosure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/HighTierContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/LowTierContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/MidTierContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/Suites.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/tiers/TargetProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/util/GraphOrder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/util/Providers.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/CFGPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/CFGPrinterObserver.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/CompilationPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/GraphPrinter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/AllocationSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/BoxingSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/DimensionsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/GraphKit.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/IsArraySnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/JavacBug.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/NodeStrideUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/PEGraphDecoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/ReplacementsImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/ReplacementsUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/SnippetCounter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/SnippetCounterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/SnippetTemplate.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/Snippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/classfile/Classfile.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/AESNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/LogNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MacroNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/runtime/RuntimeProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/GraalServices.java (99%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/JMXService.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/OWNERS.toml (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/OWNERS.toml (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/CollectionsUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/OptionsEncoder.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/TypedDataInputStream.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/TypedDataOutputStream.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/json/JSONFormatter.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/json/JSONParser.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/util/json/JSONParserException.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/BarrieredAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/ObjectAccess.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/Word.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/WordCastNode.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/WordOperationPlugin.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/WordTypes.java (100%)
 rename compiler/src/{jdk.internal.vm.compiler => jdk.compiler.graal}/src/jdk/compiler/graal/word/WordVerificationImpl.java (100%)

diff --git a/ci_includes/publish-javadoc.jsonnet b/ci_includes/publish-javadoc.jsonnet
index 6a0a6befaf67..933965e4216f 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.internal.vm.compiler", "--packages", "org.graalvm.graphio"],
-      ["cd", "src/jdk.internal.vm.compiler/"],
+      ["mx", "javadoc", "--projects", "jdk.compiler.graal", "--packages", "jdk.compiler.graal.graphio"],
+      ["cd", "src/jdk.compiler.graal/"],
       ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
       ["cd", "../../.."],
       ["set-export", "GRAAL_REPO", ["pwd"]],
diff --git a/compiler/docs/Debugging.md b/compiler/docs/Debugging.md
index 2d71d7a1f6aa..0d03325325b0 100644
--- a/compiler/docs/Debugging.md
+++ b/compiler/docs/Debugging.md
@@ -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.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java)
+[DebugFilter](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java)
 and documented in the
-[Dump help message](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt). As
+[Dump help message](../src/jdk.compiler.graal/src/jdk/compiler/graal/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.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java#L33-L92)
+[MethodFilter](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java#L33-L92)
 and documented in the
-[MethodFilter help message](../src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt).
+[MethodFilter help message](../src/jdk.compiler.graal/src/jdk/compiler/graal/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.internal.vm.compiler/src/jdk/compiler/graal/graph/Graph.java)) to the
+  [Graph](../src/jdk.compiler.graal/src/jdk/compiler/graal/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)
 
diff --git a/compiler/mx.compiler/mx_compiler.py b/compiler/mx.compiler/mx_compiler.py
index 79c50598d277..a5fa78d93e34 100644
--- a/compiler/mx.compiler/mx_compiler.py
+++ b/compiler/mx.compiler/mx_compiler.py
@@ -47,8 +47,6 @@
 from mx_unittest import unittest, parse_split_args
 
 from mx_javamodules import as_java_module
-from mx_updategraalinopenjdk import updategraalinopenjdk
-from mx_renamegraalpackages import renamegraalpackages
 import mx_sdk_vm_impl
 
 import mx_benchmark
@@ -108,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.internal.vm.compiler', 'src', 'org', 'graalvm', 'compiler',
+        source_path = join(_suite.dir, 'src', 'jdk.compiler.graal', 'src', 'org', 'graalvm', 'compiler',
                            'hotspot',
                            'JVMCIVersionCompare.java')
         out = mx.OutputCapture()
@@ -157,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.internal.vm.compiler', 'src', 'jdk', 'compiler', 'graal', 'hotspot',
+    source_path = join(_suite.dir, 'src', 'jdk.compiler.graal', 'src', 'jdk', 'compiler', 'graal', 'hotspot',
                        'JVMCIVersionCheck.java')
     return mx.run([jdk.java, '-Xlog:disable', source_path] + (args or []), **kwargs)
 
@@ -469,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.internal.vm.compiler')], ('hotspot', 'libgraal'))
+        if t: _check_forbidden_imports([mx.project('jdk.compiler.graal')], ('hotspot', 'libgraal'))
 
     with Task('JDK_java_base_test', tasks, tags=['javabasetest'], report=True) as t:
         if t: java_base_unittest(_remove_empty_entries(extraVMarguments) + [])
@@ -785,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.internal.vm.compiler,ALL-UNNAMED'])
+        mainClassArgs.extend(['-JUnitOpenPackages', 'jdk.internal.vm.ci/*=org.graalvm.truffle.runtime,jdk.compiler.graal,ALL-UNNAMED'])
 
         limited_modules = None
         for arg in vmArgs:
@@ -1526,8 +1524,6 @@ def profdiff(args):
     'collate-metrics': [collate_metrics, 'filename'],
     'ctw': [ctw, '[-vmoptions|noinline|nocomplex|full]'],
     'java_base_unittest' : [java_base_unittest, 'Runs unittest on JDK java.base "only" module(s)'],
-    'updategraalinopenjdk' : [updategraalinopenjdk, '[options]'],
-    'renamegraalpackages' : [renamegraalpackages, '[options]'],
     'javadoc': [javadoc, ''],
     'makegraaljdk': [makegraaljdk_cli, '[options]'],
     'graaljdk-home': [print_graaljdk_home, '[options]'],
diff --git a/compiler/mx.compiler/mx_graal_benchmark.py b/compiler/mx.compiler/mx_graal_benchmark.py
index 6dea7e16af30..373e48dda6eb 100644
--- a/compiler/mx.compiler/mx_graal_benchmark.py
+++ b/compiler/mx.compiler/mx_graal_benchmark.py
@@ -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.internal.vm.compiler/jdk.compiler.graal.graph=ALL-UNNAMED',
+                 '--add-exports=jdk.compiler.graal/jdk.compiler.graal.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/mx_renamegraalpackages.py b/compiler/mx.compiler/mx_renamegraalpackages.py
deleted file mode 100644
index 99028ccbc5c4..000000000000
--- a/compiler/mx.compiler/mx_renamegraalpackages.py
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Copyright (c) 2019, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-import os
-import shutil
-from argparse import ArgumentParser
-from os.path import join, exists
-
-import mx
-from mx_updategraalinopenjdk import package_renamings, rename_packages
-
-def renamegraalpackages(args):
-    """ rename Graal packages to match names in OpenJDK"""
-    parser = ArgumentParser(prog='mx renamegraalpackages')
-    parser.add_argument('version', type=int, help='Java version of the OpenJDK')
-
-    args = parser.parse_args(args)
-
-    package_suffixes = {
-        'org.graalvm.collections' : ['', '.test'],
-        'org.graalvm.nativeimage' : ['', '.test'],
-        'org.graalvm.options'     : [''],
-        'org.graalvm.word'        : [''],
-        'org.graalvm.libgraal'    : ['', '.jdk8', '.jdk11', '.jdk13', '.jni', '.jni.annotation', '.jni.processor']
-    }
-    vc_dir = mx.primary_suite().vc_dir
-
-    # rename packages
-    def rename_one(filepath, old, new):
-        with open(filepath) as fp:
-            contents = fp.read()
-        new_contents = contents
-        new_contents = new_contents.replace(old, new)
-        if new_contents != contents:
-            with open(filepath, 'w') as fp:
-                fp.write(new_contents)
-
-    for proj_dir in [join(vc_dir, x) for x in os.listdir(vc_dir) if exists(join(vc_dir, x, 'mx.' + x, 'suite.py'))]:
-        for dirpath, _, filenames in os.walk(proj_dir):
-            for filename in filenames:
-                if filename.endswith('.java') or filename == 'suite.py' or filename == 'generate_unicode_properties.py' or filename == "mx_substratevm.py" or "META-INF" in dirpath:
-                    filepath = join(dirpath, filename)
-                    rename_packages(filepath)
-
-        # move directories according to new package name
-        for old_name, new_name in package_renamings.items():
-            for sfx in package_suffixes[old_name]:
-                old_path = join(proj_dir, 'src', old_name + sfx)
-                old_dir = join(old_path, 'src', old_name.replace('.', os.sep))
-                if exists(old_dir):
-                    new_name_sfx = new_name + sfx
-                    new_path = join(proj_dir, 'src', new_name_sfx)
-                    if exists(new_path):
-                        shutil.rmtree(new_path)
-                    new_dir = join(new_path, 'src', new_name.replace('.', os.sep))
-                    os.makedirs(new_dir)
-                    mx.log("Move files to new dir: " + new_dir)
-                    for f in os.listdir(old_dir):
-                        shutil.move(os.path.join(old_dir, f), new_dir)
-                    old_meta = join(old_path, 'src', 'META-INF')
-                    if exists(old_meta):
-                        new_meta = join(new_path, 'src', 'META-INF')
-                        shutil.move(old_meta, new_meta)
-                    shutil.rmtree(old_path)
-
-    # rename in additional place
-    package = 'com.oracle.svm.graal.hotspot.libgraal'
-    filepath = join(vc_dir, 'substratevm', 'src', package, 'src', package.replace('.', os.sep), 'LibGraalEntryPoints.java')
-    old = 'Java_org_graalvm_libgraal'
-    new = 'Java_jdk_internal_vm_compiler_libgraal'
-    rename_one(filepath, old, new)
diff --git a/compiler/mx.compiler/mx_updategraalinopenjdk.py b/compiler/mx.compiler/mx_updategraalinopenjdk.py
deleted file mode 100644
index 2d2197095531..000000000000
--- a/compiler/mx.compiler/mx_updategraalinopenjdk.py
+++ /dev/null
@@ -1,486 +0,0 @@
-#
-# Copyright (c) 2018, 2021, Oracle and/or its affiliates. All rights reserved.
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# This code is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License version 2 only, as
-# published by the Free Software Foundation.  Oracle designates this
-# particular file as subject to the "Classpath" exception as provided
-# by Oracle in the LICENSE file that accompanied this code.
-#
-# This code is distributed in the hope that it will be useful, but WITHOUT
-# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
-# version 2 for more details (a copy is included in the LICENSE file that
-# accompanied this code).
-#
-# You should have received a copy of the GNU General Public License version
-# 2 along with this work; if not, write to the Free Software Foundation,
-# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
-# or visit www.oracle.com if you need additional information or have any
-# questions.
-#
-
-import os
-import shutil
-import re
-from collections import namedtuple
-from argparse import ArgumentParser
-from os.path import join, exists, dirname
-
-import mx
-import mx_compiler
-
-def _read_sibling_file(basename):
-    path = join(dirname(__file__), basename)
-    with open(path, 'r') as fp:
-        return fp.read()
-
-def _find_version_base_project(versioned_project):
-    base_project_name = getattr(versioned_project, 'overlayTarget', None)
-    if base_project_name:
-        return mx.dependency(base_project_name, context=versioned_project)
-    extended_packages = versioned_project.extended_java_packages()
-    if not extended_packages:
-        mx.abort('Project with a multiReleaseJarVersion attribute must have sources in a package defined by project without multiReleaseJarVersion attribute', context=versioned_project)
-    base_project = None
-    base_package = None
-    for extended_package in extended_packages:
-        for p in mx.projects():
-            if versioned_project != p and p.isJavaProject() and not hasattr(p, 'multiReleaseJarVersion'):
-                if extended_package in p.defined_java_packages():
-                    if base_project is None:
-                        base_project = p
-                        base_package = extended_package
-                    else:
-                        if base_project != p:
-                            mx.abort('Multi-release jar versioned project {} must extend packages from exactly one project but extends {} from {} and {} from {}'.format(versioned_project, extended_package, p, base_project, base_package))
-    if not base_project:
-        mx.abort('Multi-release jar versioned project {} must extend package(s) from another project'.format(versioned_project))
-    return base_project
-
-def _is_git_repo(jdkrepo):
-    git_dir = join(jdkrepo, '.git')
-    return exists(git_dir)
-
-def rename_packages(filepath, verbose=False):
-    with open(filepath) as fp:
-        contents = fp.read()
-    new_contents = contents
-    for old_name, new_name in package_renamings.items():
-        new_contents = new_contents.replace(old_name, new_name)
-        if new_contents != contents:
-            with open(filepath, 'w') as fp:
-                fp.write(new_contents)
-                if verbose:
-                    mx.log('  updated ' + filepath)
-
-# Packages in Graal that have different names in OpenJDK so that the original packages can be deployed
-# as is on the class path and not clash with packages in the jdk.internal.vm.compiler module.
-# Also used by other script.
-package_renamings = {
-    'org.graalvm.collections' : 'jdk.internal.vm.compiler.collections',
-    'org.graalvm.word'        : 'jdk.internal.vm.compiler.word',
-    'org.graalvm.libgraal'    : 'jdk.internal.vm.compiler.libgraal',
-    'org.graalvm.nativeimage' : 'jdk.internal.vm.compiler.nativeimage',
-    'org.graalvm.options'     : 'jdk.internal.vm.compiler.options'
-}
-
-SuiteJDKInfo = namedtuple('SuiteJDKInfo', 'name includes excludes')
-GraalJDKModule = namedtuple('GraalJDKModule', 'name suites')
-
-def updategraalinopenjdk(args):
-    """updates the Graal sources in OpenJDK"""
-    parser = ArgumentParser(prog='mx updategraalinopenjdk')
-    parser.add_argument('--pretty', help='value for --pretty when logging the changes since the last JDK* tag')
-    parser.add_argument('jdkrepo', help='path to the local OpenJDK repo')
-    parser.add_argument('version', type=int, help='Java version of the OpenJDK repo')
-    parser.add_argument('--metro', action='store_true', help='update for Metropolis project (to build libgraal)')
-
-    args = parser.parse_args(args)
-
-    if mx_compiler.jdk.javaCompliance.value < args.version:
-        mx.abort('JAVA_HOME/--java-home must be Java version {} or greater: {}'.format(args.version, mx_compiler.jdk))
-
-    if not args.metro:
-        mx.log('Processing update for OpenJDK {}'.format(args.version))
-        graal_modules = [
-            # JDK module jdk.internal.vm.compiler is composed of sources from:
-            GraalJDKModule('jdk.internal.vm.compiler',
-                # 1. Classes in the compiler suite under the org.graalvm namespace except for packages
-                #    or projects whose names contain terms on the specified exclude list
-                [SuiteJDKInfo('compiler', ['org.graalvm'], ['truffle', 'management', 'core.llvm', 'replacements.llvm', 'libgraal.jni']),
-                # 2. Classes in the sdk suite under the org.graalvm.collections and org.graalvm.word namespaces
-                 SuiteJDKInfo('sdk', ['org.graalvm.collections', 'org.graalvm.word'], [])]),
-            # JDK module jdk.internal.vm.compiler.management is composed of sources from:
-            GraalJDKModule('jdk.internal.vm.compiler.management',
-                # 1. Classes in the compiler suite under the jdk.compiler.graal.hotspot.management namespace
-                [SuiteJDKInfo('compiler', ['jdk.compiler.graal.hotspot.management'], ['libgraal'])]),
-        ]
-    else:
-        if args.version < 15:
-            mx.abort('Update for Metropolis works only for JDK 15 or later')
-        mx.log('Processing update for Metropolis JDK {}'.format(args.version))
-        # Metropolis needs more code from Graal
-        graal_modules = [
-            # JDK module jdk.internal.vm.compiler is composed of sources from:
-            GraalJDKModule('jdk.internal.vm.compiler',
-                # 1. Classes in the compiler suite under the org.graalvm namespace except for packages
-                #    or projects whose names contain terms on the specified exclude list
-                [SuiteJDKInfo('compiler', ['org.graalvm'], ['truffle', 'management', 'core.llvm', 'replacements.llvm']),
-                # 2. Classes in the sdk suite under the org.graalvm.collections and org.graalvm.word namespaces
-                 SuiteJDKInfo('sdk', ['org.graalvm.collections', 'org.graalvm.word', 'org.graalvm.nativeimage', 'org.graalvm.options'], [])]),
-            # JDK module jdk.internal.vm.compiler.management is composed of sources from:
-            GraalJDKModule('jdk.internal.vm.compiler.management',
-                # 1. Classes in the compiler suite under the jdk.compiler.graal.hotspot.management namespace
-                [SuiteJDKInfo('compiler', ['jdk.compiler.graal.hotspot.management'], ['libgraal'])]),
-        ]
-
-
-    # Strings to be replaced in files copied to OpenJDK.
-    replacements = {
-        'published by the Free Software Foundation.  Oracle designates this\n * particular file as subject to the "Classpath" exception as provided\n * by Oracle in the LICENSE file that accompanied this code.' : 'published by the Free Software Foundation.',
-        _read_sibling_file('upl_substring.txt') : _read_sibling_file('gplv2_substring.txt')
-    }
-
-    # Strings that must not exist in OpenJDK source files. This is applied after replacements are made.
-    denylist = ['"Classpath" exception']
-
-    jdkrepo = args.jdkrepo
-    git_repo = _is_git_repo(jdkrepo)
-
-    for m in graal_modules:
-        m_src_dir = join(jdkrepo, 'src', m.name)
-        if not exists(m_src_dir):
-            mx.abort(jdkrepo + ' does not look like a JDK repo - ' + m_src_dir + ' does not exist')
-
-    def run_output(args, cwd=None):
-        out = mx.OutputCapture()
-        mx.run(args, cwd=cwd, out=out, err=out)
-        return out.data
-
-    for m in graal_modules:
-        m_src_dir = join('src', m.name)
-        mx.log('Checking ' + m_src_dir)
-        if git_repo:
-            out = run_output(['git', 'status', '-s', m_src_dir], cwd=jdkrepo)
-        else:
-            out = run_output(['hg', 'status', m_src_dir], cwd=jdkrepo)
-        if out:
-            mx.abort(jdkrepo + ' is not "clean":' + '\n' + out[:min(200, len(out))] + '...')
-
-    mx.checkcopyrights(['--primary', '--', '--fix'])
-
-    for dirpath, _, filenames in os.walk(join(jdkrepo, 'make')):
-        for filename in filenames:
-            if filename.endswith('.gmk'):
-                rename_packages(join(dirpath, filename), True)
-
-    java_package_re = re.compile(r"^\s*package\s+(?P[a-zA-Z_][\w\.]*)\s*;$", re.MULTILINE)
-
-    copied_source_dirs = []
-    jdk_internal_vm_compiler_EXCLUDES = set() # pylint: disable=invalid-name
-    jdk_internal_vm_compiler_test_SRC = set() # pylint: disable=invalid-name
-    # Add jdk.compiler.graal.processor since it is only a dependency
-    # for (most) Graal annotation processors and is not needed to
-    # run Graal.
-    jdk_internal_vm_compiler_EXCLUDES.add('jdk.compiler.graal.processor')
-    for m in graal_modules:
-        classes_dir = join(jdkrepo, 'src', m.name, 'share', 'classes')
-        for info in m.suites:
-            mx.log('Processing ' + m.name + ':' + info.name)
-            for e in os.listdir(classes_dir):
-                if any(inc in e for inc in info.includes) and not any(ex in e for ex in info.excludes):
-                    project_dir = join(classes_dir, e)
-                    shutil.rmtree(project_dir)
-                    mx.log('  removed ' + project_dir)
-            suite = mx.suite(info.name)
-
-            worklist = []
-
-            for p in [e for e in suite.projects if e.isJavaProject()]:
-                if str(mx_compiler.jdk.javaCompliance) not in p.javaCompliance:
-                    mx.log('  skipping {} since its compliance ({}) is not compatible with {}'.format(p, repr(p.javaCompliance), mx_compiler.jdk.javaCompliance))
-                    continue
-                if any(inc in p.name for inc in info.includes) and not any(ex in p.name for ex in info.excludes):
-                    assert len(p.source_dirs()) == 1, p
-                    version = 0
-                    new_project_name = p.name
-                    if hasattr(p, 'multiReleaseJarVersion'):
-                        version = int(getattr(p, 'multiReleaseJarVersion'))
-                        if version <= args.version:
-                            base_project = _find_version_base_project(p)
-                            new_project_name = base_project.name
-                        else:
-                            continue
-
-                    for old_name, new_name in package_renamings.items():
-                        if new_project_name.startswith(old_name):
-                            new_project_name = new_project_name.replace(old_name, new_name)
-
-                    workitem = (version, p, new_project_name)
-                    worklist.append(workitem)
-
-            # Ensure versioned resources are copied in the right order
-            # such that higher versions override lower versions.
-            worklist = sorted(worklist)
-
-            for version, p, new_project_name in worklist:
-                first_file = True
-
-                source_dir = p.source_dirs()[0]
-                target_dir = join(classes_dir, new_project_name, 'src')
-                copied_source_dirs.append(source_dir)
-
-                trailing = re.compile(r"[ \t]+\n")
-
-                src_files = run_output(['git', 'ls-files'], cwd=source_dir).split('\n')
-                for rel_src_file in src_files:
-                    if not len(rel_src_file):
-                        continue
-                    filename = os.path.basename(rel_src_file)
-                    src_file = join(source_dir, rel_src_file)
-                    dst_file = join(target_dir, os.path.relpath(src_file, source_dir))
-                    binary_flag = '' if filename.endswith('.java') else 'b'
-                    with open(src_file, 'r' + binary_flag) as fp:
-                        try:
-                            contents = fp.read()
-                        except Exception as ex: # pylint: disable=broad-except
-                            mx.log('Error reading {}: {}'.format(src_file, ex))
-                    if filename.endswith('.java'):
-                        old_line_count = len(contents.split('\n'))
-                        for old_name, new_name in package_renamings.items():
-                            old_name_as_dir = old_name.replace('.', os.sep)
-                            if old_name_as_dir in src_file:
-                                new_name_as_dir = new_name.replace('.', os.sep)
-                                dst = src_file.replace(old_name_as_dir, new_name_as_dir)
-                                dst_file = join(target_dir, os.path.relpath(dst, source_dir))
-                            contents = contents.replace(old_name, new_name)
-
-                        for old_line, new_line in replacements.items():
-                            contents = contents.replace(old_line, new_line)
-
-                        contents = re.sub(trailing, '\n', contents)
-
-                        match = java_package_re.search(contents)
-                        if not match:
-                            mx.abort('Could not find package declaration in {}'.format(src_file))
-                        java_package = match.group('package')
-                        if any(ex in java_package for ex in info.excludes):
-                            mx.log('  excluding ' + filename)
-                            continue
-
-                        new_line_count = len(contents.split('\n'))
-                        if new_line_count > old_line_count:
-                            mx.abort('Pattern replacement caused line count to grow from {} to {} in {}'.format(old_line_count, new_line_count, src_file))
-                        else:
-                            if new_line_count < old_line_count:
-                                contents = contents.replace('\npackage ', '\n' * (old_line_count - new_line_count) + '\npackage ')
-                        new_line_count = len(contents.split('\n'))
-                        if new_line_count != old_line_count:
-                            mx.abort('Unable to correct line count for {}'.format(src_file))
-                        for forbidden in denylist:
-                            if forbidden in contents:
-                                mx.abort('Found deny-listed pattern \'{}\' in {}'.format(forbidden, src_file))
-                    dst_dir = os.path.dirname(dst_file)
-                    if not exists(dst_dir):
-                        os.makedirs(dst_dir)
-                    if first_file:
-                        mx.log('  copying: ' + source_dir)
-                        mx.log('       to: ' + target_dir)
-                        if p.testProject or p.definedAnnotationProcessors:
-                            to_exclude = new_project_name
-                            jdk_internal_vm_compiler_EXCLUDES.add(to_exclude)
-                            if p.testProject:
-                                jdk_internal_vm_compiler_test_SRC.add(to_exclude)
-                        first_file = False
-                    with open(dst_file, 'w' + binary_flag) as fp:
-                        fp.write(contents)
-
-    def replace_line(filename, old_line, new_line):
-        mx.log('Updating ' + filename + '...')
-        old_lines = []
-        new_lines = []
-        with open(filename) as fp:
-            old_lines = fp.readlines()
-        for line in old_lines:
-            if line == old_line:
-                new_line = line.replace(old_line, new_line)
-                if old_line != new_line:
-                    mx.log('Replaced \n ' + old_line.strip() + '\nwith\n ' + new_line.strip())
-            new_lines.append(line.replace(old_line, new_line))
-        with open(filename, 'w') as fp:
-            fp.writelines(new_lines)
-
-    def replace_lines(filename, begin_lines, end_line, replace_lines, old_line_check, preserve_indent=False, append_mode=False):
-        mx.log('Updating ' + filename + '...')
-        old_lines = []
-        new_lines = []
-        with open(filename) as fp:
-            for begin_line in begin_lines:
-                line = fp.readline()
-                while line:
-                    stripped_line = line.strip()
-                    if stripped_line == begin_line:
-                        new_lines.append(line)
-                        break
-                    new_lines.append(line)
-                    line = fp.readline()
-                assert line, begin_line + ' not found'
-
-            lines = fp.readlines()
-            line_in_def = True
-
-            indent = 0
-            if preserve_indent:
-                line = lines[0]
-                lstripped_line = line.lstrip()
-                indent = len(line) - len(lstripped_line)
-
-            if not append_mode:
-                for replace in replace_lines:
-                    new_lines.append(' ' * indent + replace)
-
-            for line in lines:
-                stripped_line = line.strip()
-                if line_in_def:
-                    if stripped_line == end_line:
-                        line_in_def = False
-                        new_lines.append(line)
-                    else:
-                        old_line_check(line)
-                        if append_mode:
-                            new_lines.append(line)
-                    if append_mode and not line_in_def:
-                        # reach end line and append new lines
-                        for replace in replace_lines:
-                            new_lines.append(replace)
-                else:
-                    new_lines.append(line)
-        with open(filename, 'w') as fp:
-            for line in new_lines:
-                fp.write(line)
-        return old_lines
-
-    def single_column_with_continuation(line):
-        parts = line.split()
-        assert len(parts) == 2 and parts[1] == '\\', line
-
-    def do_nothing(line):
-        pass
-
-    # Exclude all test, benchmark and annotation processor packages.
-    if args.version >= 17:
-        # See JDK-8258407
-        CompileJavaModules_gmk = join(jdkrepo, 'make', 'modules', 'jdk.internal.vm.compiler', 'Java.gmk') # pylint: disable=invalid-name
-        begin_lines = ['EXCLUDES += \\']
-    else:
-        CompileJavaModules_gmk = join(jdkrepo, 'make', 'CompileJavaModules.gmk') # pylint: disable=invalid-name
-        begin_lines = ['jdk.internal.vm.compiler_EXCLUDES += \\']
-
-    new_lines = []
-    for pkg in sorted(jdk_internal_vm_compiler_EXCLUDES):
-        new_lines.append(pkg + ' \\\n')
-    end_line = '#'
-    old_line_check = single_column_with_continuation
-    replace_lines(CompileJavaModules_gmk, begin_lines, end_line, new_lines, old_line_check, preserve_indent=True)
-
-    # replace renamed service
-    compiler_module_info = join(jdkrepo, 'src', 'jdk.internal.vm.compiler', 'share', 'classes', 'module-info.java')
-    old_line = '    uses jdk.compiler.graal.nodes.graphbuilderconf.NodeIntrinsicPluginFactory;\n'
-    new_line = '    uses jdk.compiler.graal.nodes.graphbuilderconf.GeneratedPluginFactory;\n'
-    replace_line(compiler_module_info, old_line, new_line)
-
-    # Update 'SRC' in the 'Compile graalunit tests' section of make/test/JtregGraalUnit.gmk
-    # to include all test packages.
-    JtregGraalUnit_gmk = join(jdkrepo, 'make', 'test', 'JtregGraalUnit.gmk') # pylint: disable=invalid-name
-    new_lines = []
-    jdk_internal_vm_compiler_test_SRC.discard('jdk.compiler.graal.microbenchmarks')
-    jdk_internal_vm_compiler_test_SRC.discard('jdk.compiler.graal.virtual.bench')
-    jdk_internal_vm_compiler_test_SRC.discard('org.graalvm.micro.benchmarks')
-    for pkg in sorted(jdk_internal_vm_compiler_test_SRC):
-        new_lines.append('$(SRC_DIR)/' + pkg + '/src \\\n')
-    if args.version == 11:
-        begin_lines = ['### Compile and build graalunit tests', 'SRC := \\']
-    else:
-        begin_lines = ['### Compile graalunit tests', 'SRC := \\']
-    end_line = ', \\'
-    old_line_check = single_column_with_continuation
-    replace_lines(JtregGraalUnit_gmk, begin_lines, end_line, new_lines, old_line_check, preserve_indent=True)
-
-    # Updates for Metropolis
-    if args.metro:
-        # Update 'PROCESSOR_JARS' and 'PROC_SRC_SUBDIRS' in make/modules/jdk.internal.vm.compiler/Gensrc.gmk
-        Gensrc_gmk = join(jdkrepo, 'make', 'modules', 'jdk.internal.vm.compiler', 'Gensrc.gmk') # pylint: disable=invalid-name
-        begin_lines = ['PROC_SRC_SUBDIRS := \\']
-        end_line = 'jdk.compiler.graal.virtual \\'
-        new_lines = ['    jdk.internal.vm.compiler.libgraal.jni \\\n']
-        replace_lines(Gensrc_gmk, begin_lines, end_line, new_lines, old_line_check, preserve_indent=True, append_mode=True)
-
-        begin_lines = ['PROCESSOR_JARS := \\']
-        end_line = '$(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.serviceprovider.processor.jar \\'
-        new_lines = ['    $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.libgraal.jni.processor.jar \\\n']
-        replace_lines(Gensrc_gmk, begin_lines, end_line, new_lines, old_line_check, preserve_indent=True, append_mode=True)
-
-        # Add 'libgraal.jni.processor' build to make/CompileToolsHotspot.gmk
-        CompileToolsHotspot_gmk = join(jdkrepo, 'make', 'CompileToolsHotspot.gmk') # pylint: disable=invalid-name
-        begin_lines = ['TARGETS += $(BUILD_VM_COMPILER_SERVICEPROVIDER_PROCESSOR)']
-        end_line = '##############################################################################'
-        new_lines = ['\n  $(eval $(call SetupJavaCompilation, BUILD_VM_COMPILER_LIBGRAAL_JNI_PROCESSOR, \\\n',
-                     '      TARGET_RELEASE := $(TARGET_RELEASE_BOOTJDK), \\\n',
-                     '      SRC := \\\n',
-                     '          $(SRC_DIR)/jdk.compiler.graal.processor/src \\\n',
-                     '          $(SRC_DIR)/jdk.internal.vm.compiler.libgraal.jni.annotation/src \\\n',
-                     '          $(SRC_DIR)/jdk.internal.vm.compiler.libgraal.jni.processor/src \\\n',
-                     '          , \\\n',
-                     '      EXCLUDE_FILES := $(EXCLUDE_FILES), \\\n',
-                     '      BIN := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.libgraal.jni.processor, \\\n',
-                     '      JAR := $(BUILDTOOLS_OUTPUTDIR)/jdk.vm.compiler.libgraal.jni.processor.jar, \\\n',
-                     '      DISABLED_WARNINGS := options, \\\n',
-                     '  ))\n\n',
-                     '  TARGETS += $(BUILD_VM_COMPILER_LIBGRAAL_JNI_PROCESSOR)\n\n',
-                     '  ##############################################################################\n']  # indent is inlined
-        old_line_check = do_nothing
-        replace_lines(CompileToolsHotspot_gmk, begin_lines, end_line, new_lines, old_line_check, preserve_indent=True, append_mode=True)
-
-        # Rename packages in libgraal.jni.processor service
-        rename_packages(join(jdkrepo, 'src', 'jdk.internal.vm.compiler', 'share', 'classes', 'jdk.internal.vm.compiler.libgraal.jni.processor', 'src', 'META-INF', 'services', 'javax.annotation.processing.Processor'))
-
-    overwritten = ''
-    if not git_repo:
-        mx.log('Adding new files to HG...')
-        m_src_dirs = []
-        for m in graal_modules:
-            m_src_dirs.append(join('src', m.name))
-        out = run_output(['hg', 'log', '-r', 'last(keyword("Update Graal"))', '--template', '{rev}'] + m_src_dirs, cwd=jdkrepo)
-        last_graal_update = out.strip()
-
-        for m in graal_modules:
-            m_src_dir = join('src', m.name)
-            if last_graal_update:
-                overwritten += run_output(['hg', 'diff', '-r', last_graal_update, '-r', 'tip', m_src_dir], cwd=jdkrepo)
-            mx.run(['hg', 'add', m_src_dir], cwd=jdkrepo)
-        mx.log('Removing old files from HG...')
-        for m in graal_modules:
-            m_src_dir = join('src', m.name)
-            out = run_output(['hg', 'status', '-dn', m_src_dir], cwd=jdkrepo)
-            if out:
-                mx.run(['hg', 'rm'] + out.split(), cwd=jdkrepo)
-
-    out = run_output(['git', 'tag', '-l', 'JDK-*'], cwd=mx_compiler._suite.vc_dir)
-    last_jdk_tag = sorted(out.split(), reverse=True)[0]
-
-    pretty = args.pretty or 'format:%h %ad %>(20) %an %s'
-    out = run_output(['git', '--no-pager', 'log', '--merges', '--abbrev-commit', '--pretty=' + pretty, '--first-parent', '-r', last_jdk_tag + '..HEAD'] +
-            copied_source_dirs, cwd=mx_compiler._suite.vc_dir)
-    changes_file = 'changes-since-{}.txt'.format(last_jdk_tag)
-    with open(changes_file, 'w') as fp:
-        fp.write(out)
-    mx.log('Saved changes since {} to {}'.format(last_jdk_tag, os.path.abspath(changes_file)))
-    if overwritten:
-        overwritten_file = 'overwritten-diffs.txt'
-        with open(overwritten_file, 'w') as fp:
-            fp.write(overwritten)
-        mx.warn('Overwritten changes detected in OpenJDK Graal! See diffs in ' + os.path.abspath(overwritten_file))
diff --git a/compiler/mx.compiler/suite.py b/compiler/mx.compiler/suite.py
index d1b437bc5590..86e0a4455129 100644
--- a/compiler/mx.compiler/suite.py
+++ b/compiler/mx.compiler/suite.py
@@ -158,7 +158,7 @@
 
     # ------------- Graal -------------
 
-    "jdk.internal.vm.compiler" : {
+    "jdk.compiler.graal" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
@@ -203,7 +203,7 @@
       "workingSets" : "API,Graal",
       "jacoco" : "include",
       "jacocoExcludePackages" : [
-        "jdk.internal.vm.compiler.test",
+        "jdk.compiler.graal.test",
         "org.graalvm.libgraal.jni",
         "jdk.compiler.graal.replacements",
         "jdk.compiler.graal.hotspot.test",
@@ -219,22 +219,22 @@
       ],
     },
 
-    "jdk.internal.vm.compiler.processor" : {
+    "jdk.compiler.graal.processor" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "requires" : [
         "java.compiler" # javax.annotation.processing.*
       ],
       "checkPackagePrefix": "false",
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
     },
 
-    "jdk.internal.vm.compiler.test" : {
+    "jdk.compiler.graal.test" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "jdk.internal.vm.compiler",
+        "jdk.compiler.graal",
         "mx:JUNIT",
         "ASM_TREE_9.5",
         "ASM_UTIL_9.5",
@@ -279,23 +279,23 @@
         "GRAAL_PROCESSOR",
         "truffle:TRUFFLE_DSL_PROCESSOR"
       ],
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "jacoco" : "exclude",
     },
 
-    "org.graalvm.compiler.management" : {
+    "jdk.compiler.graal.management" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "jdk.internal.vm.compiler",
+        "jdk.compiler.graal",
       ],
       "requires" : [
         "jdk.internal.vm.ci",
         "jdk.management",
       ],
       "checkPackagePrefix": "false",
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "annotationProcessors" : [
         "GRAAL_PROCESSOR",
       ],
@@ -303,29 +303,29 @@
       "workingSets" : "Graal,HotSpot",
     },
 
-    "org.graalvm.compiler.hotspot.jdk21.test" : {
+    "jdk.compiler.graal.hotspot.jdk21.test" : {
       "testProject" : True,
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "jdk.internal.vm.compiler.test",
+        "jdk.compiler.graal.test",
       ],
       "requiresConcealed" : {
         "java.base" : [
           "jdk.internal.util",
         ],
       },
-      "checkstyle": "jdk.internal.vm.compiler",
+      "checkstyle": "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "javaPreviewNeeded": "21+",
       "workingSets" : "Graal,HotSpot,Test",
     },
 
-    "org.graalvm.compiler.virtual.bench" : {
+    "jdk.compiler.graal.virtual.bench" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
-      "dependencies" : ["mx:JMH_1_21", "org.graalvm.compiler.microbenchmarks"],
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "dependencies" : ["mx:JMH_1_21", "jdk.compiler.graal.microbenchmarks"],
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "annotationProcessors" : ["mx:JMH_1_21"],
       "spotbugsIgnoresGenerated" : True,
@@ -333,20 +333,20 @@
       "testProject" : True,
     },
 
-    "org.graalvm.compiler.microbenchmarks" : {
+    "jdk.compiler.graal.microbenchmarks" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
         "mx:JMH_1_21",
-        "jdk.internal.vm.compiler",
-        "jdk.internal.vm.compiler.test",
+        "jdk.compiler.graal",
+        "jdk.compiler.graal.test",
       ],
       "requiresConcealed" : {
         "jdk.internal.vm.ci" : [
           "jdk.vm.ci.meta",
         ],
       },
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "checkPackagePrefix" : "false",
       "annotationProcessors" : ["mx:JMH_1_21"],
@@ -357,18 +357,18 @@
 
     # ------------- GraalTruffle -------------
 
-    "org.graalvm.compiler.truffle.test.jdk21" : {
+    "jdk.compiler.graal.truffle.test.jdk21" : {
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies": [
-        "jdk.internal.vm.compiler.test",
+        "jdk.compiler.graal.test",
       ],
       "annotationProcessors" : [
         "GRAAL_PROCESSOR",
       ],
-      "overlayTarget" : "jdk.internal.vm.compiler.test",
+      "overlayTarget" : "jdk.compiler.graal.test",
       "multiReleaseJarVersion" : "21",
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "checkPackagePrefix" : "false",
       "jacoco": "exclude",
@@ -383,7 +383,7 @@
       "dependencies" : [
         "mx:JMH_1_21",
       ],
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "checkPackagePrefix" : "false",
       "annotationProcessors" : ["mx:JMH_1_21"],
@@ -396,10 +396,10 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "jdk.internal.vm.compiler",
+        "jdk.compiler.graal",
         "sdk:COLLECTIONS",
       ],
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
     },
 
@@ -410,7 +410,7 @@
         "org.graalvm.profdiff",
         "mx:JUNIT",
       ],
-      "checkstyle" : "jdk.internal.vm.compiler",
+      "checkstyle" : "jdk.compiler.graal",
       "javaCompliance" : "21+",
       "workingSets" : "Graal,Test",
     },
@@ -423,7 +423,7 @@
     "GRAAL_TEST" : {
       "subDir" : "src",
       "dependencies" : [
-        "jdk.internal.vm.compiler.test",
+        "jdk.compiler.graal.test",
       ],
       "distDependencies" : [
         "GRAAL",
@@ -445,7 +445,7 @@
     "GRAAL_TEST_PREVIEW_FEATURE" : {
       "subDir" : "src",
       "dependencies" : [
-        "org.graalvm.compiler.hotspot.jdk21.test",
+        "jdk.compiler.graal.hotspot.jdk21.test",
       ],
       "distDependencies" : [
         "GRAAL_TEST",
@@ -459,7 +459,7 @@
     "GRAAL_PROCESSOR" : {
       "subDir": "src",
       "dependencies" : [
-        "jdk.internal.vm.compiler.processor",
+        "jdk.compiler.graal.processor",
        ],
       "maven": False,
     },
@@ -467,7 +467,7 @@
     "GRAAL" : {
       # This distribution defines a module.
       "moduleInfo" : {
-        "name" : "jdk.internal.vm.compiler",
+        "name" : "jdk.compiler.graal",
         "requires" : [
           "jdk.unsupported" # sun.misc.Unsafe
         ],
@@ -491,7 +491,7 @@
           "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.internal.vm.compiler.management,org.graalvm.nativeimage.driver,org.graalvm.nativeimage.agent.jvmtibase,org.graalvm.nativeimage.agent.diagnostics",
+          "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",
         ],
         "uses" : [
@@ -512,7 +512,7 @@
       },
       "subDir" : "src",
       "dependencies" : [
-        "jdk.internal.vm.compiler"
+        "jdk.compiler.graal"
       ],
       "distDependencies" : [
         "sdk:COLLECTIONS",
@@ -530,11 +530,11 @@
     "GRAAL_MANAGEMENT" : {
       # This distribution defines a module.
       "moduleInfo" : {
-        "name" : "jdk.internal.vm.compiler.management",
+        "name" : "jdk.compiler.graal.management",
       },
       "subDir" : "src",
       "dependencies" : [
-        "org.graalvm.compiler.management",
+        "jdk.compiler.graal.management",
       ],
       "distDependencies" : [
         "GRAAL",
@@ -550,8 +550,8 @@
     "GRAAL_COMPILER_WHITEBOX_MICRO_BENCHMARKS" : {
       "subDir" : "src",
       "dependencies" : [
-        "org.graalvm.compiler.virtual.bench",
-        "org.graalvm.compiler.microbenchmarks",
+        "jdk.compiler.graal.virtual.bench",
+        "jdk.compiler.graal.microbenchmarks",
       ],
       "distDependencies" : [
         "GRAAL_TEST"
diff --git a/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java b/compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java
rename to compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/PreviewEnabledTest.java
diff --git a/compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java b/compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java
rename to compiler/src/jdk.compiler.graal.hotspot.jdk21.test/src/jdk/compiler/graal/hotspot/jdk21/test/ScopedValueCacheTest.java
diff --git a/compiler/src/org.graalvm.compiler.management/src/jdk/compiler/graal/management/JMXServiceProvider.java b/compiler/src/jdk.compiler.graal.management/src/jdk/compiler/graal/management/JMXServiceProvider.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.management/src/jdk/compiler/graal/management/JMXServiceProvider.java
rename to compiler/src/jdk.compiler.graal.management/src/jdk/compiler/graal/management/JMXServiceProvider.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/ConditionalEliminationBenchmark.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/FrameStateAssigmentPhaseBenchmark.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
similarity index 95%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
index e7dae18012f7..76cfd94819bc 100644
--- a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
+++ b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraalBenchmark.java
@@ -40,6 +40,6 @@
 @Fork(3)
 public class GraalBenchmark {
     static {
-        ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.compiler");
+        ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.compiler.graal");
     }
 }
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/GraphCopyBenchmark.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/NodeBenchmark.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/SchedulePhaseBenchmark.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/TestJMHWhitebox.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/FrameStateAssignmentState.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalState.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraalUtil.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/GraphState.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/MethodSpec.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/NodesState.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/graal/util/ScheduleState.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/CompileTimeBenchmark.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/GraalCompilerState.java
diff --git a/compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java b/compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
rename to compiler/src/jdk.compiler.graal.microbenchmarks/src/jdk/compiler/graal/microbenchmarks/lir/RegisterAllocationTimeBenchmark.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor b/compiler/src/jdk.compiler.graal.processor/src/META-INF/services/javax.annotation.processing.Processor
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/META-INF/services/javax.annotation.processing.Processor
rename to compiler/src/jdk.compiler.graal.processor/src/META-INF/services/javax.annotation.processing.Processor
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/core/match/processor/MatchProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/IntrinsicStubProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/lir/processor/SyncPortProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/ElementException.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/nodeinfo/processor/GraphNodeVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/options/processor/OptionProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/AbstractProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/processor/SuppressFBWarnings.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/APHotSpotSignature.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/AnnotationHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/FoldHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedFoldPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedNodeIntrinsicPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/GeneratedPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/InjectedDependencies.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/NodeIntrinsicHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/PluginGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/replacements/processor/ReplacementsAnnotationProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java b/compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java
rename to compiler/src/jdk.compiler.graal.processor/src/jdk/compiler/graal/serviceprovider/processor/ServiceProviderProcessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/BlackholeDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ConstantProbablityBranchFoldingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ControlFlowAnchorDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/DeoptimizeDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/GraalDirectiveIntrinsificationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/IterationDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/OpaqueDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveShortCircuitTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/ProbabilityDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/directives/test/SwitchCaseProbabilityDirectiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ExportingClassLoader.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/Graal.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/Graal.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/Graal.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/Graal.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/GraalAPITest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/GraalAPITest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/GraalAPITest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/GraalAPITest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ModuleSupport.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ModuleSupport.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/api/test/ModuleSupport.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/api/test/ModuleSupport.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64AddressingModeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64BitCountAssemblerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64InstructionEncodingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64LoadStoreMergingAssemblerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/AArch64MoveConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/aarch64/test/TestProtectedAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/AMD64AssemblerUtilityTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/BitOpsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IncrementDecrementMacroTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/IndirectCallTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/amd64/test/SimpleAssemblerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/asm/test/AssemblerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64AddSubShiftTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ArrayAddressTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitFieldTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64BitwiseLogicalNotTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64CbzTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ConditionalSetTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64ElideL2ITest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64FloatSqrtTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64LogicShiftTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MNegTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MatchRuleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MembarOpTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeExtendWithAddSubTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithAddSubTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MergeNarrowWithExtendTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyAddSubTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64MultiplyLongTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64NegateShiftTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64PairLoadStoreTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64RotationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64TestBitAndBranchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/aarch64/test/AArch64VolatileAccessesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AddressLoweringTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64AllocatorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64MatchRuleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/AMD64VolatileWriteMembarEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/ConstantStackMoveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/amd64/test/StackStoreTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AbsCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AllocSpy.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AllocSpy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/AllocSpy.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/AllocSpy.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayCopyVirtualizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ArrayLengthProviderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BasePhaseBinaryGraphTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BciBlockMappingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BoxingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BoxingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ByteBufferTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/BytecodeDisassemblerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CanonicalizedConversionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
index b770fa1a8e6b..94a6d22ca54d 100644
--- a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
@@ -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.internal.vm.compiler");
+                return name.contains("graal") || name.contains("jdk.compiler.graal");
             }
             return false;
         }
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CommonedConstantsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompareCanonicalizerTest3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationResultTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CompilationWatchDogTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConcreteSubtypeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationMulTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationPiTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationRegressionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationStampInversionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest10.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest11.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest12.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest13.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest14.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest15.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest5.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest6.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest7.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest8.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTest9.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalEliminationTestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConditionalNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ConstantArrayReadFoldingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CopyOfVirtualizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopMaxTripCountPiTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopOverflowTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CountedLoopTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CustomizedBytecodePatternTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeMorganCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DeepUnrollingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DegeneratedLoopsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DirectByteBufferTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DontReuseArgumentSpaceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DumpPathTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DumpPathTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DumpPathTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DumpPathTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/DynamicConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EarlyGVNTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumSwitchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/EnumValuesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FinalizableSubclassTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueConcreteMethodBugTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FindUniqueDefaultMethodTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatOptimizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingDivTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FloatingReadTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36456.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/FuzzTest36457.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerAssumptionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java
index 8381b1ddc6e5..f04fb0804856 100644
--- a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraalDebugHandlersFactoryTest.java
@@ -41,7 +41,7 @@
 import org.junit.Assume;
 import org.junit.Test;
 
-@AddExports("jdk.internal.vm.compiler/jdk.compiler.graal.printer")
+@AddExports("jdk.compiler.graal/jdk.compiler.graal.printer")
 public class GraalDebugHandlersFactoryTest extends GraalCompilerTest {
 
     @Test
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphDumpingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphEncoderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphPrinterTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphResetDebugTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphScheduleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GraphUtilOriginalValueTests.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/GuardPrioritiesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/HashCodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/HashCodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/HashCodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/HashCodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerSwapTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfReorderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfReorderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IfReorderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IfReorderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ImplicitNullCheckTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InfopointReasonTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InstalledCodeInvalidationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerBoxEqualsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivPowerOf2Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerDivRemConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerEqualsCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticCorrectnessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticOptimizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerLowerThanCommonArithmeticTestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampMulFoldTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IntegerStampShiftTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InterfaceMethodHandleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvocationPluginsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/InvokeHintsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IsArrayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IsArrayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/IsArrayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/IsArrayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LockEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LongNodeChainTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopFullUnrollTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/LoopUnswitchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MarkUnsafeAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MaskingOptimizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MatchRuleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathCopySignStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MathSignumStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryArithmeticTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryGraphCanonicalizeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MemoryScheduleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MergeCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MethodHandleEagerResolution.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MonitorGraphTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MoveGuardsLoopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MulNegateTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MulNegateTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/MulNegateTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/MulNegateTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NarrowingReadTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NegateCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedArithmeticTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NestedLoopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NewInstanceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeCopyWithInputsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodeMapGraphTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePosIteratorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/NodePropertiesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ObjectSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OffHeapUnsafeAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OnStackReplacementTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizeExtendsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptimizedBoxNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PhiCreationTests.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ProfilingInfoTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushNodesThroughPiTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/PushThroughIfTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadAfterCheckCastTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReadConstantFoldingTestGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociateAndCanonicalTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReassociationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReassociationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReentrantBlockIteratorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReferenceGetLoopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReflectionOptionDescriptors.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ResolveDynamicConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ReverseBytesIntoArrayRegressionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ScalarTypeSystemTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SchedulingTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ShortCircuitNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SimpleCFGTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleImplementorInterfaceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SingleRunSubphaseTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpectreFenceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SpeculativeGuardMovementTrivialDeoptTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StableArrayReadFoldingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StampMemoryAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StaticInterfaceFieldTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StraighteningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StraighteningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/StraighteningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/StraighteningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordArrayStoreTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordFieldStoreTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordInputTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordReturnTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubWordTestUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubprocessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubprocessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SubprocessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SubprocessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchDyingLoopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchFoldingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/SwitchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/SwitchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestAutoboxConf.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestBasePhase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestBasePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestBasePhase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestBasePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestPhase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TestPhase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TestPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TrivialInliningExplosionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TwoSlotMarkerClearingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeSystemTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/TypeWriterTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedLockingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnbalancedMonitorsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UncheckedInterfaceProviderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeCopyMemoryTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeGetStableArrayElement.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeReadEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsafeVirtualizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnschedulableGraphTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnsignedLongTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnusedArray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnusedArray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/UnusedArray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/UnusedArray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyArchUsageInPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyBailoutUsageTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsageTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyEndlessLoops.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyFoldableMethods.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGetOptionsUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyGraphUniqueUsages.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyInstanceOfUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyIterableNodeType.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyMemoryKillCheck.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyPluginFrameState.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyProfileMethodUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySharedConstantEmptyArray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySnippetProbabilities.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStatelessPhases.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyStringFormatterUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifySystemPropertyUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUnsafeAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUpdateUsages.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyUsageWithEquals.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVariableCasts.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyVirtualizableUsage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileAccessReadEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VolatileReadEliminateWrongMemoryStateTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ZeroSignExtendTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/AllocatorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/backend/BackendTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/CompiledMethodTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/MonitorDeoptTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowDeoptMaterializeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/RethrowExceptionLoopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SafepointRethrowDeoptTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/deopt/SynchronizedMethodDeoptimizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/AtomicVirtualizationTests.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/CountUppercaseParallelTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EAMergingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EATestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/EscapeAnalysisTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ExpandLogicTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/NestedBoxingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAAssertionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PEAReadEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisIterationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeAnalysisTreesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeOptimizationLogTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeUnsafeStoreTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PartialEscapeWithExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/PoorMansEATest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/ReadEliminationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/TrufflePEATest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeCompareAndSwapVirtualizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/ea/UnsafeEATest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/InliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/inlining/NestedLoopEffectsPhaseComplexityTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/jfr/TestGetEventWriter.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/GraalTutorial.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/InvokeGraal.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysis.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/tutorial/StaticAnalysisTests.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CSVUtilTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/CompilationAlarmTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/DebugContextTest.testLogging.input
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/GraalErrorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/LogStreamTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TTYTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TTYTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TTYTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TTYTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/TimerKeyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/VersionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/VersionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/debug/test/VersionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/debug/test/VersionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/GraphTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/GraphTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/GraphTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/GraphTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeBitMapTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeFormatToTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeInputListTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeMapTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUnionFindTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsageIterableTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeUsagesTests.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/NodeValidationChecksTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TestNodeInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/TypedNodeIteratorTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphOutputTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/GraphSnippetTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/graphio/NodeEncodingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableContains.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableCount.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/graph/test/matchers/NodeIterableIsEmpty.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/aarch64/test/AArch64UncompressPointerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64HotSpotFrameOmissionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/AMD64ReadAfterWriteMatchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ArrayAccessInLoopToAddressTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BinaryMathStubTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiAndn.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsi.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsmsk.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiBlsr.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/BmiCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/CompressedNullCheckTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/DataPatchInConstantsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/MathPower0Point5Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/NumberOfTrailingZeroings003.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/ReachabilityFenceCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/StubAVXTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/amd64/test/UnaryMathStubTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/BenchmarkCounterOverflowTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/ExceedMaxOopMapStackOffset.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/lir/test/MitigateExceedingMaxOopMapStackOffsetTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Adler32SubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayCopyIntrinsificationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ArrayNewInstanceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/Base64SubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BigIntegerIntrinsicsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/BoxDeoptimizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32CSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CRC32SubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckGraalIntrinsics.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CheckIndexLongTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassReplacementsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ClassSubstitutionsTests.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompilationWrapperTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java
index 19729127fa78..d6eac646a066 100644
--- a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorld.java
@@ -140,7 +140,7 @@ public final class CompileTheWorld {
 
     static {
         ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.ci");
-        ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.internal.vm.compiler");
+        ModuleSupport.exportAndOpenAllPackagesToUnnamed("jdk.compiler.graal");
         // 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.internal.vm.compiler");
+        public static final OptionKey LimitModules = new OptionKey<>("~jdk.compiler.graal");
         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.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompileTheWorldTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/CompressedOopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DataPatchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeferredBarrierAdditionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/DeoptimizeReasonAccountingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ExplicitExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ForeignCallDeoptimizeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GCStressTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalHotSpotVMConfigAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRLockTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOSRTestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/GraalOnlyIntrinsicsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotBase64Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotClassInitializationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotCryptoSubstitutionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptExplicitExceptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotDeoptPostExceptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGHASHTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotGraalOptionValuesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotInvokeJavaMethodTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotManagedFailedSpeculationListTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMethodSubstitutionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotMonitorValueTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNmethodTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotNodeSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotObjectSizeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotResolvedObjectTypeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStackIntrospectionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStampMemoryAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotStubsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HotSpotUnsafeSubstitutionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java
similarity index 98%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java
index 165d5d25ed16..e336b85a37d0 100644
--- a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/HsErrLogTest.java
@@ -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.internal.vm.compiler/jdk.compiler.graal.api.directives=ALL-UNNAMED");
+        args.add("--add-exports=jdk.compiler.graal/jdk.compiler.graal.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.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/InstalledCodeExecuteHelperTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIInfopointErrorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckMaxValueTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/JVMCIVersionCheckTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LambdaStableNameTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LibGraalCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/LogNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathDoubleFMATest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFMAConstantInputTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MathFloatFMATest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/MemoryUsageBenchmark.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectCloneTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ObjectHashCodeInliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/OptionsInFileTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/PolymorphicInliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ProfileReplayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/RangeCheckPredicatesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReferenceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/ReservedStackAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringInternConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/StringUTF16ToBytesGetCharsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/TestIntrinsicCompiles.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeNewArrayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/UnsafeWritebackMemoryTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadCarrierThreadTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/VirtualThreadJFRTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/hotspot/test/WriteBarrierAdditionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/JTTTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/JTTTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/JTTTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/JTTTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/ConstantPhiTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/EmptyMethodTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/backend/LargeConstantSectionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aaload_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_aload_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_anewarray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_areturn.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_arraylength.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_athrow.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_baload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_bastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_caload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_castore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_checkcast03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2f.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2i02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_d2l03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dadd.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_daload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp07.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp08.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp09.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dcmp10.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ddiv.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dmul.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dneg2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_double_base.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_drem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dreturn.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_dsub2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2d.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2i02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_f2l02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fadd.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_faload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp07.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp08.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp09.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fcmp10.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fdiv.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fload_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_float_base.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fmul.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fneg.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_frem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_freturn.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_fsub.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_b.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_c.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_d.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_f.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_i.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_l.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_o.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_s.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getfield_z.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_b.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_c.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_d.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_f.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_i.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_l.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_s.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_getstatic_z.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2b.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2c.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2d.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2f.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2l.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_i2s.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iadd_const3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iaload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iand.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iconst.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_idiv_overflow.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifeq_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifge_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifgt.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmplt2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ificmpne2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifle.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iflt.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifne.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnonnull_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ifnull_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iinc_4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_0_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_1_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iload_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_imul.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ineg.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_instanceof01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokeinterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokespecial2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokestatic.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_invokevirtual.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ior.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_irem4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ireturn.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishl.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ishr.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_isub.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_iushr.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ixor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2d.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2f.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_l2i_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ladd2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_laload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_land.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lcmp.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldc_06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_ldiv_overflow.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lload_3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lmul.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lneg.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lookupswitch05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lrem2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lreturn.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshl.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lshr02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lsub.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lushr.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_lxor.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_monitorenter02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_multianewarray04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_new.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_newarray_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putfield_04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_putstatic.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_saload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_sastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_tableswitch4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/bytecode/BC_wide02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aaload1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_aastore1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_anewarray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_arraylength.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_athrow3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_baload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_baload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_baload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_baload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_bastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_caload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_caload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_caload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_caload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_castore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_castore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_castore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_castore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast3.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast5.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_checkcast6.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_daload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_daload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_daload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_daload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_dastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_faload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_faload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_faload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_faload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_fastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_getfield1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iaload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_iastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_idiv2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokespecial01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_invokevirtual02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_irem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_irem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_irem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_irem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_laload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_laload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_laload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_laload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_ldiv2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_lrem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_monitorenter.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_multianewarray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_newarray.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_putfield.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_saload.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_saload.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_saload.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_saload.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/BC_sastore.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Loop03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NASE_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_00.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_07.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_08.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_09.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_10.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_NPE_11.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_StackOverflowError_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Two03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Catch_Unresolved03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Locals.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Except_Synchronized05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Finally02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Finally02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_AIOOBE_00.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_CCE_00.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_00.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/StackTrace_NPE_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InCatch03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_InNested.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_NPE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/Throw_Synchronized05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/except/UntrustedInterfaces.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_allocate04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_array04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_control02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_convert01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_count.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_dead01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_demo01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_field04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_idea.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_inline02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_invoke01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_life.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_nest02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_scope02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_series.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotpath/HP_trees01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6186134.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6196102.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6753639.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6823354.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6850611.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test6959129.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/hotspot/Test7005594.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/CharacterBits.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Class_getName.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/DivideUnsigned.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/EnumMap02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerBits.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/IntegerShuffleBitsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongBits.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/LongShuffleBitsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/ShortBits.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_currentTimeMillis02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_nanoTime02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/System_setOut.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Thread_setName.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAccess01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/UnsafeAllocateInstance01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwap.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/jdk/Unsafe_compareAndSwapNullCheck.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Boxed_TYPE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Bridge_method01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/CheckedListTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ClassLoader_loadClass01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_Literal01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_asSubclass01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_cast02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_forName05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getComponentType01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getInterfaces01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getModifiers02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getName02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSimpleName02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_getSuperClass01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isArray01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isAssignableFrom03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInstance07.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isInterface01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Class_isPrimitive01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_conditional.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_isInfinite.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Double_toString.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_conditional.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Float_isInfinite.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greater03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_greaterEqual03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_less03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_lessEqual03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Int_reverseBits.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/JDK_ClassLoaders02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/LambdaEagerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greater03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_greaterEqual03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_less03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_lessEqual03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBits.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Long_reverseBytes02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_abs.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_copySign.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_cos.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exact.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_exp.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_log10.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_minMax.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_pow.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_round.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_round.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_round.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_round.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_signum.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_sqrt.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Math_tan.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_clone02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_equals01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_getClass01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_hashCode02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notify02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_notifyAll02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_toString02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/Object_wait03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/ProcessEnvironment_init.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/StringCoding_Scale.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_intern03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/String_valueOf01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/System_identityHashCode01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/lang/UnaryMath.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/DegeneratedLoop.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop07_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop08.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop08.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop08.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop08.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop09_2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop11.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop11.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop11.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop11.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop12.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop12.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop12.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop12.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop13.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop13.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop13.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop13.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop14.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop14.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop14.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop14.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop15.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop15.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop15.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop15.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop17.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop17.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/Loop17.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/Loop17.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopEscape.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopInline.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopLastIndexOf.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopNewInstance.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopParseLong.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhi.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopPhiResolutionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSpilling.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopSwitch01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/LoopUnroll.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/loop/SpillLoopPhiVariableAtDefinition.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ArrayCompare02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BC_invokevirtual2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigByteParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigDoubleParams02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigFloatParams02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigIntParams02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigInterfaceParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigLongParams02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigMixedParams04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigObjectParams02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigParamsAlignment.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigShortParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/BigVirtualParams01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Bubblesort.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ConstantLoadTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Fibonacci.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/FloatingReads.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeInterface_04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/InvokeVirtual_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/Matrix01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/ReferenceMap01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/StrangeFrames.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/String_format02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/String_format02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_String01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_Unroll.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_boolean01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_byte01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_char01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_double01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_float01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_int01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_long01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/micro/VarArgs_short01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ABCE_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopy06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayCopyGeneric.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ArrayLength01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_idiv_4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_imul_4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_ldiv_4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lmul_4.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C16.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C24.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BC_lshr_C32.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BlockSkip01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/BoxingIdentity.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/CE_InstanceOf.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Cmov02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Conditional01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConditionalElimination02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ConvertCompare.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/DeadCode02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Cast01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Convert04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Double04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Float03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_InstanceOf01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Int02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Long02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Fold_Math01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/GuardMovement.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/IfNodeCanonicalizationsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InferStamp01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Inline02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/InstanceOf.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LLE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/List_reorder_bug.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Logic0.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/LongToSomethingArray01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NCE_FlowSensitive05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_byte04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_char03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Narrow_short03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/NestedLoop_EA.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Phi03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/ReassociateConstants.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Convert01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Double01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Float01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Int04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_IntShift02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_Long04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Reduce_LongShift02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SchedulingBug_01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SignExtendShort.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/Switch02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/SwitchHashTableTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyFloats.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TrichotomyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/TypeCastElem.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/UnsafeDeopt.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Cast02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Convert02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Double03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Field02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Float02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_InstanceOf03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Int03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Long03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/optimize/VN_Loop01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_get03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getBoolean01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getByte01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getChar01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getDouble01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getFloat01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getInt01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLength01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getLong01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_getShort01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_newInstance06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_set03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setBoolean01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setByte01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setChar01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setDouble01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setFloat01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setInt01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setLong01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Array_setShort01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredField01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getDeclaredMethod01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getField02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_getMethod02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance06.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Class_newInstance07.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_get04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_getType01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Field_set03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_except01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_main03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Invoke_virtual01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getParameterTypes01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/reflect/Method_getReturnType01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_contended01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitor_notowner01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Monitorenter02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Object_wait04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedLoopExit01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/SynchronizedParserInlineTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/ThreadLocal03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_currentThread01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_getState02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_holdsLock01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isAlive01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted04.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_isInterrupted05.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_join03.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_new02.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_setPriority01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_sleep01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/jtt/threads/Thread_yield01.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/ConstantStackCastTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestSpecification.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/LIRTestTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackMoveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/jtt/StackStoreLoadTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/CompositeValueReplacementTest1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/lir/test/GenericValueMapTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopPartialUnrollTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/loop/test/LoopsDataTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AbstractObjectStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AddNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/AndNodeCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/CompareZeroExtendWithConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ConstantNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ExceptionLivenessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/FloatStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/GraphStateTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IfNodeCanonicalizationTest2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/InliningLogTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerShuffleBitsStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampFoldTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampMaskTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/IntegerStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LongShuffleBitsStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopLivenessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/LoopPhiCanonicalizerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowPreservesOrderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NarrowTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/NegateNodeCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampJoinTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampMeetTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ObjectStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OptimizationLogTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/OrNodeCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/PrimitiveStampBoundaryTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampDoubleToLongTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampFloatToIntTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampIntToFloatTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampLongToDoubleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ReinterpretStampTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/ShortCircuitOrNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampInverterTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StampToolTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StaticFieldAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/StructuredGraphTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/SubCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/TruncateCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/nodes/test/XorNodeCanonicalizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/NestedBooleanOptionKeyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/TestOptionKey.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/TestOptionKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/options/test/TestOptionKey.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/options/test/TestOptionKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/phases/common/test/StampFactoryTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayCopyExceptionSeenTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayEqualsConstantLengthTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArrayStoreBytecodeExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ArraysSubstitutionsTestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BitOpNodesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/BytecodeExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CharIsDigitTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CheckIndexTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ClassCastBytecodeExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledExceptionHandlerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CompiledNullPointerExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/CountPositivesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnIntegerExactTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DeoptimizeOnVolatileReadTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DerivedOopTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/DynamicNewArrayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EdgesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/EncodeArrayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/FloatArraysEqualsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HalfFloatTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/HasNegativesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IndexOobBytecodeExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfDynamicTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InstanceOfTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerExactFoldTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/IntegerSubOverflowsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/InvokerSignatureMismatchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathMultiplyHighTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MathRoundTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleImplTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodHandleMacroTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MethodSubstitutionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/MonitorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NestedExceptionHandlerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewArrayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewInstanceTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NewMultiArrayTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/NullBytecodeExceptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ObjectAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PEGraphDecoderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/PointerTrackingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/ReplacementsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SnippetsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StandardMethodSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToAVX512Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompareToTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringCompressInflateTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringEqualsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringGetBytesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringHashConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharConstantBindingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfCharTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfDeoptimizeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIndexOfTestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringIntrinsicRangeChecksTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionTestBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/StringSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SubstitutionNodeSourcePositionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/SystemArrayCopyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/TypeCheckTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeBooleanAccessTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeObjectReplacementsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeReplacementsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsafeSubstitutionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedIntegerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnsignedMathTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/UnwindExceptionToCallerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VarHandleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/VectorizedHashCodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/WordTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/WordTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/WordTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/WordTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/replacements/test/classfile/ClassfileBytecodeProviderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddExports.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddExports.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddExports.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddExports.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddJVM.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddJVM.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddJVM.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddJVM.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddModules.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddModules.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/AddModules.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/AddModules.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CommandLine.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CommandLine.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CommandLine.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CommandLine.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CountUppercase.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CountUppercase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/CountUppercase.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/CountUppercase.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/GraalTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/GraalTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/GraalTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/GraalTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/SubprocessUtil.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/SubprocessUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/test/SubprocessUtil.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/test/SubprocessUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AOTSupportCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AbstractSplittingStrategyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AddExports.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AddExports.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AddExports.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AddExports.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AllocationReporterPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumedValuePartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AssumptionPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BailoutPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BeginNodeOptimizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeInterpreterPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/BytecodeOSRNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CachedLibraryCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CastExactPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CodeInvalidationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationFinalWeakReferencePartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilationMemoryTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerAssertsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerInitializationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerOptionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ContextLookupCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ControlFlowExceptionPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DFAPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DefaultLoomTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DeoptInvalidateListener.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EngineModeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EnumPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExceptionActionTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExecutionListenerCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExitDuringCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExplodeLoopBlockDuplicationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FinalBitSetCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FlushEngineQueueTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameAccessVerificationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameDescriptorTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/FrameHostReadsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR35581Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GR36613Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GenerateInlineCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GetRootNodeCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/GraalTruffleRuntimeListenerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HashCodeIntrinsicTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterExampleTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningBytecodeInterpreterTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/IndirectCallSiteTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentationCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LanguageContextFreedTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetNegativeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTargetPositiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LazyClassLoadingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibraryInheritanceCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LibrarySplittingStrategyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoomUtils.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodeOSRTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/LoopNodePartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MaterializedFrameTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MergeExplodeProxyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierAssumptionInvalidationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/MultiTierCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibraryCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLibrarySLCompilerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeLimitTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/NodeSplittingStrategyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OSRCancelTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ObjectsRequireNonNullPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedBlockNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedCallTargetTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedLoomTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OptimizedOSRLoopNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/OverrideOptionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiStampInferencePartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotEngineOptionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PolyglotHostObjectPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PropagateHotnessToLexicalSingleCallerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ResourceLimitsCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/RewriteDuringCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLCompileImmediatelyTestSuite.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SLTruffleGraalTestSuite.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SafepointRethrowDeoptPETest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/SimplePartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StaticObjectCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/StringNodeInliningCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithPolyglotOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TestWithSynchronousCompiling.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ThreadsActivationCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TraceCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TransferToInterpreterTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryExceptionsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleBoundaryInliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleContextCompilationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleDirectCallNodeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleEnsureVirtualizedTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleExceptionPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleHostInliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleLoggerPartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleOptionsByClassLoaderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleReturnBoxedParameterTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleRuntimeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleShutdownHookTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleToTruffleCallExceptionHandlerTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleValueTypeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/UnrollLoopBlockDuplicationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/VarHandlePartialEvaluationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertFalseBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertTrueBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLAssertionError.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallFunctionsWithBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLCallUntilOptimizedBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDeoptimizeWhenCompiledBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLDisableSplittingBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGetOptionBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLGraalRuntimeBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsCompilationConstantBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLIsOptimizedBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLTestTruffleBoundary01Builtin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/builtins/SLWaitForOptimizationBuiltin.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/BTreeQueueTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/collection/DelegatingBlockingQueueTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InlineOnlyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/inlining/InliningTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AbstractTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AddTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/AssumptionCutsBranchTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/BlockTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ConstantWithAssumptionTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ExplodeLoopUntilReturnWithThrowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode1.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/InliningNullCheckNode2.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/IsLoggableNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LambdaTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoadLocalTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoggingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/LoopTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NeverPartOfCompilationTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/NonConstantTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/ObjectHashCodeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/PartialIntrinsicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RecursionTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/RootTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StoreLocalTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeFinalNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/StringHashCodeNonFinalNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/SynchronizedExceptionMergeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/TestNodeFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/UnrollLoopUntilReturnWithThrowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/LoopExplosionPhiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/NestedExplodedLoopTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/TwoMergesExplodedLoopTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/nodes/explosion/UnrollingTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringConstantFoldingTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesBMPTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesLatin1Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesReturnValuesInSyncTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF16Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF32Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCalcStringAttributesUTF8Test.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantStrideTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCompareTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyConstantStrideTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyReturnValueTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsCopyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyRangeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfAnyTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTableTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsIndexOfTwoConsecutiveTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantLengthTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantStrideTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsConstantTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsRegionEqualsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringOpsTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/VectorizedMismatchTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexCompilerTestDummyLanguage.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/tregex/TRegexTStringVirtualizationTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/AddModulesTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/AddModulesTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/AddModulesTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/AddModulesTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionSizeTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/CollectionUtilTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/JSONParserTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/JSONParserTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/JSONParserTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/JSONParserTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java
index 158df3e4cb15..4982366242c8 100644
--- a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/ObjectSizeEstimate.java
@@ -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.internal.vm.compiler}).
+ * {@code --add-exports=java.base/jdk.internal.module=jdk.compiler.graal}).
  */
 public final class ObjectSizeEstimate {
 
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java
rename to compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/util/test/OptionsEncoderTest.java
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/sl/TestCompilationThreshold.sl b/compiler/src/jdk.compiler.graal.test/src/sl/TestCompilationThreshold.sl
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/sl/TestCompilationThreshold.sl
rename to compiler/src/jdk.compiler.graal.test/src/sl/TestCompilationThreshold.sl
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/sl/TestDeoptInInlinedFunction.output b/compiler/src/jdk.compiler.graal.test/src/sl/TestDeoptInInlinedFunction.output
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/sl/TestDeoptInInlinedFunction.output
rename to compiler/src/jdk.compiler.graal.test/src/sl/TestDeoptInInlinedFunction.output
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/sl/TestOSR.sl b/compiler/src/jdk.compiler.graal.test/src/sl/TestOSR.sl
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/sl/TestOSR.sl
rename to compiler/src/jdk.compiler.graal.test/src/sl/TestOSR.sl
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/sl/TestTruffleBoundary01.sl b/compiler/src/jdk.compiler.graal.test/src/sl/TestTruffleBoundary01.sl
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/sl/TestTruffleBoundary01.sl
rename to compiler/src/jdk.compiler.graal.test/src/sl/TestTruffleBoundary01.sl
diff --git a/compiler/src/jdk.internal.vm.compiler.test/src/sl/disabled/TestIsCompilationConstant1.sl b/compiler/src/jdk.compiler.graal.test/src/sl/disabled/TestIsCompilationConstant1.sl
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler.test/src/sl/disabled/TestIsCompilationConstant1.sl
rename to compiler/src/jdk.compiler.graal.test/src/sl/disabled/TestIsCompilationConstant1.sl
diff --git a/compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java b/compiler/src/jdk.compiler.graal.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java
rename to compiler/src/jdk.compiler.graal.truffle.test.jdk21/src/jdk/compiler/graal/truffle/test/LoomUtils.java
diff --git a/compiler/src/org.graalvm.compiler.virtual.bench/.checkstyle.exclude b/compiler/src/jdk.compiler.graal.virtual.bench/.checkstyle.exclude
similarity index 100%
rename from compiler/src/org.graalvm.compiler.virtual.bench/.checkstyle.exclude
rename to compiler/src/jdk.compiler.graal.virtual.bench/.checkstyle.exclude
diff --git a/compiler/src/org.graalvm.compiler.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java b/compiler/src/jdk.compiler.graal.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java
similarity index 100%
rename from compiler/src/org.graalvm.compiler.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java
rename to compiler/src/jdk.compiler.graal.virtual.bench/src/jdk/compiler/graal/virtual/bench/PartialEscapeBench.java
diff --git a/compiler/src/jdk.internal.vm.compiler/.checkstyle_checks.xml b/compiler/src/jdk.compiler.graal/.checkstyle_checks.xml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/.checkstyle_checks.xml
rename to compiler/src/jdk.compiler.graal/.checkstyle_checks.xml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/directives/GraalDirectives.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/directives/GraalDirectives.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/directives/GraalDirectives.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/directives/GraalDirectives.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Fold.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Fold.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Fold.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Fold.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Snippet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Snippet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/Snippet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/Snippet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetReflectionProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/replacements/SnippetTemplateCache.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalJVMCICompiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalRuntime.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalRuntime.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/api/runtime/GraalRuntime.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/api/runtime/GraalRuntime.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AbstractAddress.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AbstractAddress.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AbstractAddress.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AbstractAddress.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AsmOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AsmOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/AsmOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/AsmOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Assembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Assembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Assembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Assembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/BranchTargetOutOfBoundsException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Buffer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Buffer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Buffer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Buffer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Label.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Label.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/Label.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/Label.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/VectorSize.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/VectorSize.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/VectorSize.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/VectorSize.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64ASIMDMacroAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Address.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64Assembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/AArch64MacroAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/aarch64/ASIMDKind.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Address.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Address.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Address.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Address.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64Assembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64BaseAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AMD64MacroAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AVXKind.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AVXKind.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/asm/amd64/AVXKind.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/asm/amd64/AVXKind.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BridgeMethodUtils.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/Bytecode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/Bytecode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeDisassembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeLookupSwitch.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeStream.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeStream.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeStream.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeStream.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeSwitch.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/BytecodeTableSwitch.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/Bytecodes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecodes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/Bytecodes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytecodes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/Bytes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/Bytes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/Bytes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/OWNERS.toml b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/OWNERS.toml
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/bytecode/ResolvedJavaMethodBytecodeProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/CompilationResult.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/CompilationResult.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/CompilationResult.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/CompilationResult.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/DataSection.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DataSection.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/DataSection.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DataSection.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/DisassemblerProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DisassemblerProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/DisassemblerProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/DisassemblerProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/HexCodeFile.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFile.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/HexCodeFile.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFile.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/HexCodeFileDisassemblerProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/ObjdumpDisassemblerProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/SourceMapping.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceMapping.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/SourceMapping.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceMapping.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/code/SourceStackTraceBailoutException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilationPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilationPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilationWatchDog.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWatchDog.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilationWatchDog.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWatchDog.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilationWrapper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWrapper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilationWrapper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilationWrapper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThread.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThread.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThread.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThread.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThreadFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThreadFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/CompilerThreadFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/CompilerThreadFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompilerOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompilerOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalCompilerOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalCompilerOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalServiceThread.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalServiceThread.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/GraalServiceThread.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/GraalServiceThread.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/Instrumentation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/Instrumentation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/Instrumentation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/Instrumentation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/LIRGenerationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/LIRGenerationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/LIRGenerationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/LIRGenerationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressLoweringByUse.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64AddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64ArithmeticLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64BarrierSetLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LIRKindTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64LoweringProviderMixin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64MoveFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeLIRBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64NodeMatchRules.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64PointerAddNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/aarch64/AArch64SuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressLowering.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64AddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64ArithmeticLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64BarrierSetLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64CompressAddressLowering.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LIRKindTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64LoweringProviderMixin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64MoveFactoryBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeLIRBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64NodeMatchRules.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/AMD64SuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/amd64/UseTrappingDivPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/BootstrapMethodIntrospection.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CancellationBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CancellationBailoutException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CancellationBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CancellationBailoutException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationIdentifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationIdentifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationListenerProfiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilationRequestIdentifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilerProfiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilerProfiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompilerProfiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompilerProfiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompressEncoding.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompressEncoding.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/CompressEncoding.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/CompressEncoding.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldIntrospection.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldIntrospection.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldIntrospection.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldIntrospection.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Fields.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Fields.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Fields.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Fields.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldsScanner.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldsScanner.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/FieldsScanner.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/FieldsScanner.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalBailoutException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalBailoutException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/GraalOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/GraalOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKind.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKind.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKind.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKind.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKindWithCast.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKindWithCast.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/LIRKindWithCast.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/LIRKindWithCast.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/NumUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/NumUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/NumUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/NumUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/PermanentBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/PermanentBailoutException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/PermanentBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/PermanentBailoutException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/RetryableBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/RetryableBailoutException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/RetryableBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/RetryableBailoutException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SpectrePHTMitigations.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Stride.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Stride.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/Stride.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/Stride.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/StrideUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/StrideUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/StrideUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/StrideUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressFBWarnings.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/SuppressSVMWarnings.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/BasicBlockOrderUtils.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/DefaultCodeEmissionOrder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/LinearScanOrder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/alloc/RegisterAllocationConfig.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/CanonicalCondition.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/Condition.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/Condition.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/Condition.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/Condition.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvert.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvert.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvert.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvert.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/FloatConvertCategory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/ReinterpretUtils.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/calc/UnsignedMath.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/AbstractControlFlowGraph.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlock.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BasicBlockSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BlockMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BlockMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/BlockMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/BlockMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CFGVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/CodeEmissionOrder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/DominatorOptimizationProblem.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/Loop.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/Loop.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/Loop.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/Loop.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/cfg/PropertyConsumable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/MitigateSpeculativeExecutionAttacksHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/doc-files/TraceInliningHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/BarrierType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/BarrierType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/BarrierType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/BarrierType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryExtendKind.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/memory/MemoryOrderMode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/CodeGenProviders.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ConstantFieldProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallDescriptor.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallLinkage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallSignature.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/ForeignCallsProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/JavaConstantFieldProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/LIRKindTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/spi/MetaAccessExtensionProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractObjectStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/AbstractPointerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticOpTable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ArithmeticStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/CompressibleConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/DataPointerConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/FloatStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/FloatStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/FloatStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/FloatStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IllegalStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IllegalStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IllegalStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IllegalStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IntegerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IntegerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/IntegerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/IntegerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ObjectStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ObjectStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/ObjectStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/ObjectStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/PrimitiveStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/RawPointerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/Stamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/Stamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/Stamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/Stamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampPair.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampPair.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/StampPair.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/StampPair.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/SymbolicJVMCIReference.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypeReference.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypeReference.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypeReference.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypeReference.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypedConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypedConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/TypedConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/TypedConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/VoidStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/VoidStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/type/VoidStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/type/VoidStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/AbstractTypeReader.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/BitMap2D.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/BitMap2D.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/BitMap2D.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/BitMap2D.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/CompilationAlarm.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/EventCounter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/EventCounter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/EventCounter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/EventCounter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FieldKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FieldKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FieldKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FieldKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/FrequencyEncoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/IntList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/IntList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/IntList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/IntList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/MethodKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/MethodKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/MethodKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/MethodKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/PhasePlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/PhasePlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/PhasePlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/PhasePlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/ReversedList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/ReversedList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/ReversedList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/ReversedList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeConversion.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeConversion.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeConversion.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeConversion.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeReader.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeReader.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeReader.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeReader.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeWriter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeWriter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/TypeWriter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/TypeWriter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeReader.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsafeArrayTypeWriter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsignedLong.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsignedLong.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/UnsignedLong.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/UnsignedLong.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/Util.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/Util.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/common/util/Util.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/common/util/Util.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/doc-files/CompilationFailureActionHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/BytecodeParserTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/DebugInfoBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/InstructionPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/InstructionPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/InstructionPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/InstructionPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRCompilerBackend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/LIRGenerationProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeLIRBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeMatchRules.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeMatchRules.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/NodeMatchRules.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/NodeMatchRules.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/gen/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/gen/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchResult.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchResult.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchResult.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchResult.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/ComplexMatchValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/ComplexMatchValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchPattern.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchPattern.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchPattern.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchPattern.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRule.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRule.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRule.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRule.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRuleRegistry.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRules.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRules.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchRules.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchRules.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatement.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatement.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatement.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatement.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatementSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatementSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchStatementSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchStatementSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNodes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNodes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/match/MatchableNodes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/match/MatchableNodes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/BaseTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/BaseTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/BaseTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/BaseTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CEOptimization.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/CommunityCompilerConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyCompilerConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyHighTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyHighTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyHighTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyHighTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyLowTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyLowTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyLowTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyLowTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyMidTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyMidTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/EconomyMidTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/EconomyMidTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/HighTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/HighTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/HighTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/HighTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/LowTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/LowTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/LowTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/LowTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/MidTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/MidTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/MidTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/MidTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractCompilationPlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/AbstractTierPlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedCompilationPlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FullFuzzedTierPlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/FuzzedSuites.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedCompilationPlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/MinimalFuzzedTierPlan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/phases/fuzzing/PhasePlanSerializer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64LoweringProviderMixin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64NodeMatchRules.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/RISCV64ReflectionUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/riscv64/ShadowedRISCV64.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/target/Backend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/target/Backend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/core/target/Backend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/core/target/Backend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AbstractKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AbstractKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AbstractKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AbstractKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AccumulatedKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AccumulatedKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/AccumulatedKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/AccumulatedKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Assertions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Assertions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Assertions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Assertions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CSVUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CSVUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CSVUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CSVUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CausableByCompilerAssert.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CloseableCounter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CloseableCounter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CloseableCounter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CloseableCounter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CompilationListener.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CompilationListener.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CompilationListener.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CompilationListener.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKeyImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKeyImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/CounterKeyImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/CounterKeyImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugCloseable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugCloseable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugCloseable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugCloseable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfig.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfig.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfig.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfig.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfigImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfigImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugConfigImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugConfigImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpScope.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpScope.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugDumpScope.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugDumpScope.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugFilter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandlersFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandlersFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugHandlersFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugHandlersFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugVerifyHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugVerifyHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DebugVerifyHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugVerifyHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DiagnosticsOutputDirectory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GlobalMetrics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GlobalMetrics.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GlobalMetrics.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GlobalMetrics.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GraalError.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GraalError.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/GraalError.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/GraalError.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/IgvDumpChannel.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/IgvDumpChannel.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/IgvDumpChannel.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/IgvDumpChannel.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Indent.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Indent.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Indent.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Indent.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/JavaMethodContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/JavaMethodContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/JavaMethodContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/JavaMethodContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/KeyRegistry.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/KeyRegistry.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/KeyRegistry.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/KeyRegistry.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/LogStream.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/LogStream.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/LogStream.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/LogStream.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MemUseTrackerKeyImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MethodFilter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MetricKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MetricKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/MetricKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MetricKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilities.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilities.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilities.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilities.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/PathUtilitiesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/ScopeImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/ScopeImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/ScopeImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/ScopeImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/StandardPathUtilitiesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTY.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTY.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTY.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTY.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTYStreamProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTYStreamProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TTYStreamProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TTYStreamProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimeSource.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimeSource.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimeSource.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimeSource.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKeyImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKeyImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/TimerKeyImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/TimerKeyImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Versions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Versions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/Versions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/Versions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MetricsFileHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/OptimizationLogHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/PrintGraphHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Edges.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Edges.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Edges.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Edges.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraalGraphError.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraalGraphError.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraalGraphError.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraalGraphError.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Graph.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Graph.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraphNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraphNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/GraphNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/GraphNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/InputEdges.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/InputEdges.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/InputEdges.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/InputEdges.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/IterableNodeType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/IterableNodeType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/IterableNodeType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/IterableNodeType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/LinkedStack.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/LinkedStack.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/LinkedStack.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/LinkedStack.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/MemoryKillMarker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/MemoryKillMarker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/MemoryKillMarker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/MemoryKillMarker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Node.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Node.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Node.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Node.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeBitMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeBitMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeBitMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeBitMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeClass.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeClass.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeClass.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeClass.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeFlood.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeFlood.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeFlood.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeFlood.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeIdAccessor.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeIdAccessor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeIdAccessor.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeIdAccessor.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeInputList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeInputList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeInputList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeInputList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSourcePosition.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSourcePosition.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSourcePosition.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSourcePosition.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeStack.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeStack.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeStack.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeStack.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSuccessorList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSuccessorList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeSuccessorList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeSuccessorList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUnionFind.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUnionFind.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUnionFind.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUnionFind.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeUsageWithModCountIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeWorkList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeWorkList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/NodeWorkList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/NodeWorkList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Position.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Position.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/Position.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Position.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePosition.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePosition.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePosition.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePosition.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SourceLanguagePositionProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SuccessorEdges.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SuccessorEdges.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/SuccessorEdges.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/SuccessorEdges.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/TypedGraphNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/FilteredNodeIterable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicate.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicate.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicate.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicate.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicates.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicates.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/NodePredicates.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/NodePredicates.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/iterators/PredicatedProxyNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/BinaryCommutativeMarker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/CanonicalizableMarker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/NodeWithIdentity.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graph/spi/SimplifiableMarker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphBlocks.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/DefaultGraphTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphBlocks.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphBlocks.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphBlocks.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphBlocks.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphElements.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphElements.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphElements.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphElements.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphJavadocSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphLocations.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphLocations.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphLocations.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphLocations.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphOutput.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphOutput.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphOutput.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphOutput.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphProtocol.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphProtocol.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphProtocol.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphProtocol.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphStructure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphStructure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphStructure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphStructure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/GraphTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/GraphTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/ProtocolImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/ProtocolImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/ProtocolImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/ProtocolImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/doc-files/diamond.png b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/doc-files/diamond.png
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/doc-files/diamond.png
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/doc-files/diamond.png
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/graphio/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/graphio/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeBuffer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/CodeGenTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Emitter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Emitter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Emitter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Emitter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/IEmitter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/IEmitter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/IEmitter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/IEmitter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Keyword.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Keyword.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/Keyword.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/Keyword.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/NodeLowerer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BasicBlockInterpreter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockNestingVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/BlockVisitHistory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalkVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/IRWalker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/irwalk/StackifierIRWalker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/CommitAllocationLowerer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/MoveResolver.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/lowerer/PhiResolveLowerer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionData.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ReconstructionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/ScheduleWithReconstructionResult.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/StackifierData.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/CFStackifierSortPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierReconstructionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/StackifierScopeComputation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlock.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/blocks/LabeledBlockGeneration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/CatchScopeContainer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/IfScopeContainer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/LoopScopeContainer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/Scope.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/ScopeContainer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/reconstruction/stackifier/scopes/SwitchScopeContainer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/ResolvedVar.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableAllocation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hightiercodegen/variables/VariableMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/BootstrapWatchDog.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CommunityCompilerConfigurationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationCounters.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationCounters.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationCounters.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationCounters.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationStatistics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationStatistics.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationStatistics.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationStatistics.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationTask.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationTask.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilationTask.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilationTask.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompileTheWorldFuzzedSuitesCompilationTask.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/CompilerConfigurationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/DefaultInstrumentation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EconomyCompilerConfigurationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EncodedSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EncodedSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/EncodedSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/EncodedSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfig.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/GraalHotSpotVMConfigAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBackendFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotBytecodeParser.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCodeCacheListener.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompilationIdentifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCompiledCodeBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotCounterOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDataBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotDebugInfoBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotForeignCallLinkageImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalCompilerFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalJVMCIServiceLocator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalOptionValues.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntime.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalRuntimeProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalServices.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraalVMEventListener.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderInstance.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotGraphBuilderPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotHostBackend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerationResult.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotLockStack.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotMarkId.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotNodeLIRBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReferenceMapBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotReplacementsImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotSnippetMetaAccessProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotTTYStreamProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/HotSpotZBarrierSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicate.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/IsGraalPredicateBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JFRCompilerProfiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCICompilerShadow.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCheck.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/JVMCIVersionCompare.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/ProfileReplaySupport.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetObjectConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaMethod.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetResolvedJavaType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetSignature.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetSignature.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SnippetSignature.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SnippetSignature.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/SymbolicSnippetEncoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotBackendFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallEpilogueOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCRuntimeCallPrologueOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotCounterOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeCallerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDeoptimizeWithExceptionCallerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectStaticCallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotDirectVirtualCallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotEpilogueOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotForeignCallsProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotJumpToExceptionHandlerInCallerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotLoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMacroAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMove.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotMoveFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotNodeLIRBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotPatchReturnAddressOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotRegisterAllocationConfig.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotReturnOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSafepointOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotStrategySwitchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotSuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotUnwindOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZAtomicReadAndWriteOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrierSetLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZBarrieredOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZCompareAndSwapOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64HotSpotZReadBarrierOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/aarch64/AArch64IndirectCallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64DeoptimizeOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotAddressLowering.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotBackendFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallEpilogueOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCRuntimeCallPrologueOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotCounterOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeCallerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDeoptimizeWithExceptionCallerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotDirectStaticCallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotEpilogueBlockEndOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotForeignCallsProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotFrameMapBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotIndirectCallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotJumpToExceptionHandlerInCallerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLIRKindTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotLoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMacroAssembler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMathIntrinsicOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMove.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotMoveFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotNodeLIRBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPatchReturnAddressOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotPushInterpreterFrameOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRegisterAllocationConfig.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotRestoreRbpOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotReturnOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSafepointOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotStrategySwitchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotSuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotUnwindOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZAtomicReadAndWriteOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrierSetLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZBarrieredOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZCompareAndSwapOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZReadBarrierOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotSpotZVectorReadBarrierOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64HotspotDirectVirtualCallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64MathStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64TailcallOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathIntrinsicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/amd64/AMD64X87MathSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/BenchmarkCounters.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/AbortOnBenchmarkCounterOverflowHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/debug/doc-files/BenchmarkDynamicCountersHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/HotSpotZapRegistersPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/lir/VerifyMaxRegisterSizePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/AddressLoweringHotSpotSuitesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/DefaultHotSpotLoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotConstantFieldProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotDisassemblerProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotExceptionDispatchPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallDescriptor.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotForeignCallsProviderImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotFuzzedSuitesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraalConstantFieldProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotGraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotHostForeignCallsProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPluginProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotInvocationPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotJITClassInitializationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoadedSuitesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotLoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotMetaAccessExtensionProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotNodePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotPlatformConfigurationProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotProviders.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegisters.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotRegistersProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSnippetReflectionProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotStampProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotSuitesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/HotSpotWordOperationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/meta/UnimplementedGraalIntrinsics.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AcquiredCASLockNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/AllocaNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/BeginLockScopeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentJavaThreadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/CurrentLockNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeCallerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizeWithExceptionInCallerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/DeoptimizingStubCall.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/EndLockScopeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/FastAcquireBiasedLockNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotCompressionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotDirectCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotIndirectCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotLoadReservedReferenceNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/HotSpotStoreReservedReferenceNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerInCallerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/JumpToExceptionHandlerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/KlassBeingInitializedCheckNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/LoadIndexedPointerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/MonitorCounterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/PatchReturnAddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubForeignCallNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/StubStartNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VMErrorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/VirtualThreadUpdateJFRNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/HotSpotNarrowOopStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/KlassPointerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MetaspacePointerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodCountersPointerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/nodes/type/MethodPointerStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/phases/OnStackReplacementPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/AssertionSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/CallSiteTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ClassGetHubNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/DigestBaseSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/FastNotifyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotAllocationSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotG1WriteBarrierSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotHashCodeSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIdentityHashCodeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotInvocationPluginHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotIsArraySnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReflectionGetCallerClassNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotReplacementsUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotSpotSerialWriteBarrierSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HotspotSnippetsOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/HubGetClassNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/InstanceOfSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/KlassLayoutHelperNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LoadExceptionObjectSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/Log.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/Log.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/Log.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/Log.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/LogSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/MonitorSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectCloneSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/ObjectSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/RegisterFinalizerSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/StringToBytesSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/TypeCheckSnippetUtils.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeCopyMemoryNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/UnsafeSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/VirtualThreadUpdateJFRSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/CheckcastArrayCopyCallNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/GenericArrayCopyCallNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/arraycopy/HotSpotArraycopySnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/replacements/doc-files/ProfileAllocationsContextHelp.txt
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotBackendFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotForeignCallsProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotLoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/riscv64/RISCV64HotSpotSuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/AbstractForeignCallStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ArrayStoreExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ClassCastExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/CreateExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/DivisionByZeroExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ExceptionHandlerStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/ForeignCallStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/HotSpotGraphKit.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IllegalArgumentExceptionArgumentIsNotAnArrayStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntegerExactOverflowExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/IntrinsicStubs.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/InvokeJavaMethodStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/LongExactOverflowExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NegativeArraySizeExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/NullPointerExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/OutOfBoundsExceptionStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/SnippetStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/Stub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/Stub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/Stub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/Stub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubCompilationIdentifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/StubUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/UnwindExceptionToCallerStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/stubs/VerifyOopStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotOperation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/HotSpotWordTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/KlassPointer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/KlassPointer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/KlassPointer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/KlassPointer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MetaspacePointer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodCountersPointer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodPointer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodPointer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/MethodPointer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/MethodPointer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/hotspot/word/PointerCastNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BciBlockMapping.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BciBlockMapping.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BciBlockMapping.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BciBlockMapping.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParser.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParser.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParser.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParser.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParserOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParserOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/BytecodeParserOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/BytecodeParserOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/DefaultSuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/DefaultSuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/DefaultSuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/DefaultSuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/FrameStateBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/FrameStateBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/FrameStateBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/FrameStateBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/GraphBuilderPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/GraphBuilderPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/GraphBuilderPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/GraphBuilderPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrNotSupportedBailout.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrScope.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrScope.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/JsrScope.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/JsrScope.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LambdaUtils.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LambdaUtils.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LambdaUtils.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LambdaUtils.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LargeLocalLiveness.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LargeLocalLiveness.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LargeLocalLiveness.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LargeLocalLiveness.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LocalLiveness.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LocalLiveness.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/LocalLiveness.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/LocalLiveness.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SmallLocalLiveness.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SmallLocalLiveness.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SmallLocalLiveness.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SmallLocalLiveness.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/StableMethodNameFormatter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/StableMethodNameFormatter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/StableMethodNameFormatter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/StableMethodNameFormatter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SuitesProviderBase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SuitesProviderBase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/java/SuitesProviderBase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/java/SuitesProviderBase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/BailoutAndRestartBackendException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CastValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CastValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CastValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CastValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValueClass.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValueClass.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/CompositeValueClass.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/CompositeValueClass.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ComputeCodeEmissionOrder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ConstantValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ConstantValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ConstantValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ConstantValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ControlFlowOptimizer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/EdgeMoveOptimizer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/FullInfopointOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/FullInfopointOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/FullInfopointOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/FullInfopointOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStub.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStub.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStub.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStub.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStubs.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStubs.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GenerateStubs.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GenerateStubs.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/GeneratedStubsHolder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ImplicitLIRFrameState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionStateProcedure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionStateProcedure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionStateProcedure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionStateProcedure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueConsumer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueConsumer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueConsumer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueConsumer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueProcedure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueProcedure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/InstructionValueProcedure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/InstructionValueProcedure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIR.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIR.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIR.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIR.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRFrameState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRFrameState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRFrameState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRFrameState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInsertionBuffer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstruction.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstruction.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstruction.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstruction.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionClass.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionClass.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionClass.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionClass.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRInstructionVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRIntrospection.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRIntrospection.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRIntrospection.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRIntrospection.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRValueUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRValueUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LIRValueUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LIRValueUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LabelRef.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LabelRef.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/LabelRef.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/LabelRef.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/NullCheckOptimizer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/NullCheckOptimizer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/NullCheckOptimizer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/NullCheckOptimizer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Opcode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Opcode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Opcode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Opcode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/RedundantMoveElimination.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/RedundantMoveElimination.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/RedundantMoveElimination.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/RedundantMoveElimination.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StandardOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StandardOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StandardOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StandardOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StateProcedure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StateProcedure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/StateProcedure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/StateProcedure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SwitchStrategy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SwitchStrategy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SwitchStrategy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SwitchStrategy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPort.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPort.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPort.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPort.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPorts.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPorts.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/SyncPorts.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/SyncPorts.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueConsumer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueConsumer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueConsumer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueConsumer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueProcedure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueProcedure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ValueProcedure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ValueProcedure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Variable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Variable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/Variable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/Variable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/VirtualStackSlot.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/VirtualStackSlot.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/VirtualStackSlot.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/VirtualStackSlot.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESDecryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AESEncryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AcrossVectorOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AddressValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArithmeticOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCompareToOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayCopyWithConversionsOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayEqualsOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayIndexOfOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ArrayRegionCompareToOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64AtomicMove.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMulAddOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerMultiplyToLenOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BigIntegerSquareToLenOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitFieldOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitManipulationOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BitSwapOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BlockEndOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64BreakpointOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ByteSwap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CacheWritebackPostSyncOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CalcStringAttributesOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Call.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESDecryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CipherBlockChainingAESEncryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Compare.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ComplexVectorOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ControlFlow.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Convert.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CountPositivesOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64CounterModeAESCryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64EncodeArrayOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FloatToHalfFloatOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64FrameMapBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64GHASHProcessBlocksOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HalfFloatToFloatOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64HaltOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRFlags.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64LIRInstruction.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MD5Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathCopySignOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathIntrinsicBinaryOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64MathSignumOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64Move.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64NormalizedUnsignedCompareOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PauseOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PermuteOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64PrefetchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReadTimestampCounter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ReinterpretOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RestoreRegistersOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64RoundFloatToIntegerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA1Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA256Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA3Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SHA512Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SaveRegistersOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpeculativeBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64SpinWaitOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringLatin1InflateOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64StringUTF16CompressOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64VectorizedMismatchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapRegistersOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZapStackOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/aarch64/AArch64ZeroMemoryOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/AllocationStageVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/OutOfRegistersException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/RegisterAllocationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/SaveCalleeSaveRegisters.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Interval.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/IntervalWalker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAllocationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanAssignLocationsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanEliminateSpillMovePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanIntervalDumper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanLifetimeAnalysisPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanOptimizeSpillPositionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanRegisterAllocationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanResolveDataFlowPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/LinearScanWalker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/MoveResolver.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/OptimizingLinearScanWalker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Range.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Range.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/Range.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/Range.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/RegisterVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScan.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanEliminateSpillMovePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanLifetimeAnalysisPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSALinearScanResolveDataFlowPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/alloc/lsra/ssa/SSAMoveResolver.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESDecryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AESEncryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64AddressValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Arithmetic.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArithmeticLIRGeneratorTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCompareToOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayCopyWithConversionsOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayEqualsOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayIndexOfOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ArrayRegionCompareToOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMulAddOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerMultiplyToLenOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BigIntegerSquareToLenOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Binary.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BinaryConsumer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BitSwapOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BlockEndOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64BreakpointOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ByteSwapOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CacheWritebackPostSyncOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CalcStringAttributesOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Call.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Call.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Call.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Call.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESDecryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CipherBlockChainingAESEncryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ClearRegisterOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ComplexVectorOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ControlFlow.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CountPositivesOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64CounterModeAESCryptOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64EncodeArrayOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FloatToHalfFloatOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64FrameMapBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64GHASHProcessBlocksOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HalfFloatToFloatOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64HaltOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LFenceOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64LIRInstruction.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MD5Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCopySignOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathCosOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathExpOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicBinaryOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathIntrinsicUnaryOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLog10Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathLogOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathPowOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSignumOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathSinOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MathTanOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Move.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Move.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64MulDivOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64NormalizedUnsignedCompareOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PauseOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64PrefetchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadProcid.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ReadTimestampCounterWithProcid.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RestoreRegistersOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64RoundFloatToIntegerOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA1Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256AVX2Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA256Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SHA512Op.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SaveRegistersOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ShiftOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64SignExtendOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringLatin1InflateOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64StringUTF16CompressOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Ternary.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64Unary.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64UnaryConsumer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VZeroUpper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedHashCodeOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64VectorizedMismatchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapRegistersOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZapStackOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/AMD64ZeroMemoryOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/EndbranchOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/phases/StackMoveOptimizationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBinary.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorBlend.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorClearOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorCompareOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorFloatCompareOp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorGather.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorInstruction.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorMove.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorShuffle.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AMD64VectorUnary.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/amd64/vector/AVX512Support.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/ArrayDataPointerConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/CompilationResultBuilderFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/DataBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/DataBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/DataBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/DataBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/EntryPointDecorator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/FrameContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/FrameContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/asm/FrameContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/asm/FrameContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantLoadOptimization.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTree.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTree.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/ConstantTreeAnalyzer.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/DefUseTree.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/DefUseTree.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/UseEntry.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/UseEntry.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/UseEntry.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/UseEntry.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/VariableMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/VariableMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/constopt/VariableMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/constopt/VariableMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/IntervalDumper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/IntervalDumper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/debug/LIRGenerationDebugContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarker.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarker.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/LocationMarkerPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/MarkBasePointersPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/RegStackValueSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/dfa/UniqueWorkList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/FrameMapBuilderTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/ReferenceMapBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlot.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/SimpleVirtualStackSlotAlias.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/framemap/VirtualStackSlotRange.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/ArithmeticLIRGeneratorTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/BarrierSetLIRGeneratorTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/DiagnosticLIRGeneratorTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerationResult.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGenerator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/LIRGeneratorTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/MoveFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/MoveFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/MoveFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/MoveFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/gen/VerifyingMoveFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/hashing/IntHasher.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/hashing/IntHasher.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/hashing/IntHasher.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/hashing/IntHasher.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/AllocationStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/AllocationStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyAllocationStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyFinalCodeAnalysisStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPostAllocationOptimizationStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/EconomyPreAllocationOptimizationStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/FinalCodeAnalysisStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRPhaseSuite.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRSuites.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRSuites.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/LIRSuites.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/LIRSuites.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PostAllocationOptimizationStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/phases/PreAllocationOptimizationStage.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MethodProfilingPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfiler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveProfilingPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/profiling/MoveType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/profiling/MoveType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/ssa/SSAVerifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/FixPointIntervalBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/LSStackSlotAllocator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/SimpleStackSlotAllocator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackInterval.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackIntervalDumper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/stackslotalloc/StackSlotAllocatorUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/GenericValueMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/GenericValueMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/GenericValueMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/GenericValueMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/IndexedValueMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/IndexedValueMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/RegisterMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/RegisterMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/RegisterMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/RegisterMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/lir/util/ValueSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/lir/util/ValueSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/ConvertDeoptimizeToGuardPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopFullUnrollPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPartialUnrollPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPeelingPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopPredicationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopSafepointEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopTransformations.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopTransformations.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/LoopUnswitchingPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/loop/phases/SpeculativeGuardMovementPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/InputType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/InputType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/InputType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/InputType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeCycles.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeCycles.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeSize.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeSize.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/NodeSize.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/NodeSize.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/StructuralInput.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/StructuralInput.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/Verbosity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/Verbosity.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodeinfo/Verbosity.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodeinfo/Verbosity.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractBeginNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractBeginNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractDeoptimizeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractEndNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractEndNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractEndNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractEndNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractFixedGuardNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractLocalNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractLocalNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractMergeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractMergeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractStateSplit.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/AbstractStateSplit.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ArithmeticOperation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ArithmeticOperation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BeginStateSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BinaryOpLogicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BreakpointNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BreakpointNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/BreakpointNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/BreakpointNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Cancellable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Cancellable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Cancellable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Cancellable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CanonicalizableLocation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompanionObjectEncoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompressionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompressionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/CompressionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/CompressionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ComputeObjectAddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConditionAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConstantNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConstantNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ConstantNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ConstantNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSinkNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSinkNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSinkNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSinkNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ControlSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ControlSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeadEndNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeadEndNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeadEndNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeadEndNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptBciSupplier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingFixedWithNextNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingGuard.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DeoptimizingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DirectCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicDeoptimizeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicPiNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicPiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/DynamicPiNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/DynamicPiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EncodedGraph.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EncodedGraph.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EncodedGraph.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EncodedGraph.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EndNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EndNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EndNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EndNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryMarkerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryMarkerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryProxyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryProxyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/EntryProxyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/EntryProxyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FieldLocationIdentity.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedGuardNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedGuardNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedGuardNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedGuardNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNodeInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedNodeInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FixedWithNextNodeInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingAnchoredNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FloatingGuardedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FrameState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FrameState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FrameState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FrameState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FullInfopointNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FullInfopointNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/FullInfopointNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/FullInfopointNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GetObjectAddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphDecoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphDecoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphDecoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphDecoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphEncoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphEncoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphEncoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphEncoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GraphState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GraphState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardPhiNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardPhiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardPhiNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardPhiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardProxyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardProxyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardProxyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardProxyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardedValueNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardedValueNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/GuardedValueNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/GuardedValueNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IfNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IfNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IfNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IfNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ImplicitNullCheckNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/IndirectCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLog.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLog.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLog.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLog.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLogCodec.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLogCodec.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InliningLogCodec.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InliningLogCodec.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invokable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invokable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invokable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invokable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invoke.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invoke.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/Invoke.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/Invoke.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/InvokeWithExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LIRLowerableLogicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicConstantNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicConstantNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicConstantNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicConstantNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNegationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNegationNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNegationNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNegationNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LogicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LogicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopBeginNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopBeginNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopBeginNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopBeginNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopEndNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopEndNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopEndNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopEndNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopExitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopExitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoopExitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoopExitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/LoweredCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryMapControlSinkNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryProxyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MemoryProxyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MergeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MergeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/MergeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/MergeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NamedLocationIdentity.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NodeView.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NodeView.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/NodeView.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/NodeView.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLog.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLog.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLog.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLog.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogCodec.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/OptimizationLogImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ParameterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ParameterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ParameterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ParameterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PauseNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PauseNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PauseNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PauseNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PhiNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PhiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PhiNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PhiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PiNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PluginReplacementWithExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/PrefetchAllocateNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProfileData.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProfileData.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProfileData.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProfileData.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProxyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProxyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ProxyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ProxyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ReturnNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ReturnNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ReturnNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ReturnNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SafepointNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SafepointNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SafepointNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SafepointNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ShortCircuitOrNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SimplifyingGraphDecoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SnippetAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SpinWaitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SpinWaitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/SpinWaitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/SpinWaitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StartNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StartNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StartNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StartNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StateSplit.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StateSplit.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StateSplit.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StateSplit.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StaticDeoptimizingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StructuredGraph.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StructuredGraph.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/StructuredGraph.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/StructuredGraph.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/TypeCheckHints.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/TypeCheckHints.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/TypeCheckHints.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/TypeCheckHints.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnaryOpLogicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableBeginNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableControlSinkNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnreachableNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnreachableNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnwindNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnwindNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/UnwindNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/UnwindNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNodeInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueNodeInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValuePhiNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValuePhiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValuePhiNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValuePhiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueProxyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueProxyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/ValueProxyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/ValueProxyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/VirtualState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/VirtualState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/VirtualState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/VirtualState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/WithExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/WithExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/WithExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/WithExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AbstractNormalizeCompareNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AddNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AddNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AddNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AddNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AndNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AndNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/AndNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/AndNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryArithmeticNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/BinaryNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompareNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompareNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompareNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompareNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CompressBitsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConditionalNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConvertNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ConvertNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CopySignNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/CopySignNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ExpandBitsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FixedBinaryNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatConvertNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatDivNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatLessThanNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatNormalizeCompareNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatTypeTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingIntegerDivRemNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/FloatingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerBelowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerConvertNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerDivRemNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLessThanNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerLowerThanNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerMulHighNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerNormalizeCompareNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IntegerTestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IsNullNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/IsNullNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/LeftShiftNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MaxNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MaxNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MaxNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MaxNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinMaxNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MinNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MinNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MulNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MulNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/MulNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/MulNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NarrowableArithmeticNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NegateNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NegateNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NegateNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NegateNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NotNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NotNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/NotNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/NotNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ObjectEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/OrNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/OrNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/OrNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/OrNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/PointerEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ReinterpretNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RemNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RemNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RemNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RemNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RightShiftNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundFloatToIntegerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/RoundNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/RoundNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ShiftNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ShiftNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignExtendNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedDivNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerDivNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedFloatingIntegerRemNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignedRemNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignumNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignumNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SignumNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SignumNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SqrtNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SqrtNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SubNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SubNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/SubNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/SubNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/TernaryNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/TernaryNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryArithmeticNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnaryNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnpackEndianHalfNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedDivNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMaxNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedMinNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRemNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/UnsignedRightShiftNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/XorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/XorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/XorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/XorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/calc/ZeroExtendNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ControlFlowGraph.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRBlock.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/HIRLoop.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/LocationSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/LocationSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/cfg/ReversePostOrder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BindToRegisterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/BlackholeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/ControlFlowAnchored.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/DynamicCounterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverStripMineNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/NeverWriteSinkNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SideEffectNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/SpillRegistersNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/StringToBytesNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/debug/VerifyHeapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AbstractBoxingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/AnchoringNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ArrayRangeWrite.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BoxNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BoxNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BoxNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BoxNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BranchProbabilityNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/BytecodeExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CacheWritebackSyncNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/CaptureStateBeginNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ClassIsArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/FixedValueAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCall.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCall.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ForeignCallNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GetClassNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GetClassNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardedUnsafeLoadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardingNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/GuardingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/HubGetClassNodeInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/IntegerSwitchNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaReadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/JavaWriteNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadArrayComponentHubNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadHubOrNullNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/LoadMethodNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MembarNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MembarNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MembarNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MembarNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorEnter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorExit.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MonitorExit.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/MultiGuardNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/NullCheckNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLocalNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRLockNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRMonitorEnterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OSRStartNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ObjectIsArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueGuardNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueLogicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/OpaqueValueNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawLoadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/RawStoreNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StateSplitProxyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/StoreHubNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchCaseProbabilityNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/SwitchNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnboxNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnboxNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeAccessNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeCopyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryLoadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/UnsafeMemoryStoreNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/extended/ValueAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ArrayRangeWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/BarrierSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/BarrierSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/CardTableBarrierSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePostWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ArrayRangePreWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1BarrierSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PostWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1PreWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/G1ReferentFieldReadBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ObjectWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialArrayRangeWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/SerialWriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/WriteBarrier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/gc/ZBarrierSet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ClassInitializationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ForeignCallPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedFoldInvocationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedInvocationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedNodeIntrinsicInvocationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GeneratedPluginInjectionProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/GraphBuilderTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InlineInvokePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/IntrinsicContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPluginContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/InvocationPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/LoopExplosionPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/NodePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/ParameterPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/graphbuilderconf/TypePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractCompareAndSwapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractNewObjectNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AbstractUnsafeCompareAndSwapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessFieldNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessIndexedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AccessMonitorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ArrayLengthNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndAddNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/AtomicReadAndWriteNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ClassIsAssignableFromNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/DynamicNewInstanceNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ExceptionObjectNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/FinalFieldBarrierNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ForeignCallDescriptors.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfDynamicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/InstanceOfNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadExceptionObjectNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadFieldNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoadIndexedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LogicCompareAndSwapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndAddNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredAtomicReadAndWriteNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/LoweredRegisterFinalizerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MethodCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorEnterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorExitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/MonitorIdNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewInstanceNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/NewMultiArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ReachabilityFenceNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/RegisterFinalizerNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreFieldNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/StoreIndexedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/TypeSwitchNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndExchangeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/UnsafeCompareAndSwapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValidateNewInstanceClassNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/java/ValueCompareAndSwapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/BasicInductionVariable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/CountedLoopInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DefaultLoopPolicies.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedConvertedInductionVariable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedInductionVariable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedOffsetInductionVariable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/DerivedScaledInductionVariable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/InductionVariableHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopEx.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopEx.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopEx.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopEx.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopExpandableNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragment.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInside.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideBefore.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentInsideFrom.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopFragmentWhole.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopPolicies.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsData.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsData.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsData.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsData.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/LoopsDataProviderImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/MathUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/MathUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/loop/MathUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/loop/MathUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractMemoryCheckpoint.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AbstractWriteNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/AddressableMemoryAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ExtendableMemoryAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FixedAccessNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableAccessNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatableThreadLocalAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingAccessNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/FloatingReadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/GuardedMemoryAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/LIRLowerableAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryKill.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryKill.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryMapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MemoryPhiNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/MultiMemoryKill.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OnHeapMemoryAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/OrderedMemoryAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ReadNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ReadNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/ReadNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/ReadNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SideEffectFreeWriteNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/SingleMemoryKill.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/WriteNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/WriteNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/WriteNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/WriteNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/AddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/IndexAddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/memory/address/OffsetAddressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArithmeticLIRLowerable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ArrayLengthProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Canonicalizable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CanonicalizerTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProviders.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProviders.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/CoreProvidersDelegate.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/DelegatingReplacements.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LIRLowerable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LimitedValueProxy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoopsDataProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Lowerable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Lowerable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Lowerable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Lowerable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/LoweringTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/MemoryEdgeProxy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeLIRBuilderTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeValueMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeWithState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/NodeWithState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/PlatformConfigurationProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ProfileProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Proxy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Proxy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Proxy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Proxy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Replacements.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Replacements.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Replacements.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Replacements.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ResolvedJavaMethodProfileProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Simplifiable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Simplifiable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SimplifierTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SnippetParameterInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StableProfileProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampInverter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampInverter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampInverter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampInverter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/StampProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/StampProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/SwitchFoldable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/UncheckedInterfaceProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ValueProxy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/ValueProxy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Virtualizable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/Virtualizable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizableAllocation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/VirtualizerTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/WordVerification.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/WordVerification.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/spi/WordVerification.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/spi/WordVerification.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/NarrowOopStamp.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/StampTool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/StampTool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/type/StampTool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/type/StampTool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantFoldUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/ConstantReflectionUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/GraphUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/GraphUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/GraphUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/GraphUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/IntegerHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/IntegerHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormattable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/JavaConstantFormatter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/SignedIntegerHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/util/UnsignedIntegerHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/AllocatedObjectNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/CommitAllocationNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EnsureVirtualizedNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/EscapeObjectState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/LockState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/LockState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/LockState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/LockState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/MaterializedObjectState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualBoxingNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualInstanceNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/nodes/virtual/VirtualObjectState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumMultiOptionKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumMultiOptionKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumOptionKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumOptionKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/EnumOptionKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/EnumOptionKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoGeneratedReport.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ExcludeFromJacocoInstrumentation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ModifiableOptionValues.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ModifiableOptionValues.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/ModifiableOptionValues.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/ModifiableOptionValues.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/NestedBooleanOptionKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OWNERS.toml b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OWNERS.toml
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/Option.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/Option.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/Option.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/Option.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptor.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptor.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptor.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptor.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptors.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptors.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptors.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptors.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptorsMap.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionDescriptorsMap.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionGroup.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionGroup.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionGroup.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionGroup.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionKey.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionKey.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionKey.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionKey.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionStability.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionStability.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionStability.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionStability.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionValues.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionValues.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionValues.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionValues.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionsParser.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionsParser.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionsParser.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionsParser.java
index 4b0caf2a8d52..df385af25949 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/options/OptionsParser.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/options/OptionsParser.java
@@ -54,7 +54,7 @@ public static Iterable getOptionsLoader() {
             return cachedOptionDescriptors;
         }
         /*
-         * The Graal module (i.e., jdk.internal.vm.compiler) is loaded by the platform class loader.
+         * The Graal module (i.e., jdk.compiler.graal) 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.internal.vm.compiler/src/jdk/compiler/graal/phases/BasePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/BasePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/BasePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/BasePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/ClassTypeSequence.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/ClassTypeSequence.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/ClassTypeSequence.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/ClassTypeSequence.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/FloatingGuardPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/FloatingGuardPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/LazyName.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/LazyName.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/LazyName.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/LazyName.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/OptimisticOptimizations.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/OptimisticOptimizations.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Phase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Phase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Phase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Phase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PhaseSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PhaseSuite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PhaseSuite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PhaseSuite.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PlaceholderPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PlaceholderPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/PlaceholderPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/PlaceholderPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/SingleRunSubphase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/SingleRunSubphase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/SingleRunSubphase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/SingleRunSubphase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Speculative.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Speculative.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/Speculative.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/Speculative.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/VerifyPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/VerifyPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/VerifyPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/VerifyPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AbstractInliningPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByNodePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringByUsePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/AddressLoweringPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BarrierSetVerificationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeIdentityPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/BoxNodeOptimizationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/CanonicalizerPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ConditionalEliminationUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeadCodeEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DeoptimizationGroupingPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DisableOverflownCountedLoopsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/DominatorBasedGlobalValueNumberingPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ExpandLogicPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FinalCanonicalizerPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FixReadsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FixReadsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FloatingReadPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/FrameStateAssignmentPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/GuardLoweringPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/HighTierLoweringPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IncrementalCanonicalizerPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/InsertGuardFencesPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/IterativeConditionalEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LazyValue.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LazyValue.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LazyValue.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LazyValue.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LockEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoopSafepointInsertionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LowTierLoweringPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoweringPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoweringPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/LoweringPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/LoweringPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/MidTierLoweringPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeDivPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/OptimizeExtendsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PostRunCanonicalizationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ProfileCompiledMethodsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/PropagateDeoptimizeProbabilityPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RawConditionalEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ReassociationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/ReassociationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/RemoveValueProxyPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/SnippetFrameStateAssignment.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingNullChecksPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/UseTrappingOperationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/VerifyHeapAtReturnPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/WriteBarrierAdditionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/InliningUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AbstractInlineInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/AssumptionInlineInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/ExactInlineInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/InlineInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/MultiTypeGuardInlineInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/TypeGuardInlineInfo.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/Inlineable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/info/elem/InlineableGraph.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/AbstractInliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/GreedyInliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineEverythingPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InlineMethodSubstitutionsPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/policy/InliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/CallsiteHolderExplorable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/ComputeInliningRelevance.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningData.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/InliningIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/inlining/walker/MethodInvocation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/EconomicSetNodeEventListener.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/LoopUtility.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/LoopUtility.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/common/util/OptimizationUtility.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/NodeCostUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/PhaseSizeContract.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/contract/VerifyNodeCosts.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/FixedNodeRelativeFrequencyCache.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/MergeableState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/MergeableState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/MergeableState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/MergeableState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/PostOrderNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantBlockIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ReentrantNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/ScheduledNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/StatelessPostOrderNodeIterator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/graph/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/graph/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/package-info.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/package-info.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/package-info.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/package-info.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/BlockClosure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/BlockClosure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/SchedulePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/schedule/ScheduleVerification.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/CompilerConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/HighTierContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/HighTierContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/LowTierContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/LowTierContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/MidTierContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/MidTierContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/Suites.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/Suites.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/Suites.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/Suites.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesCreator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/SuitesProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/TargetProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/tiers/TargetProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/GraphOrder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/GraphOrder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/GraphOrder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/GraphOrder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/Providers.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/Providers.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/Providers.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/Providers.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/phases/util/ValueMergeUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BciBlockMappingDumpHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/BinaryGraphPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinterObserver.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CFGPrinterObserver.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CanonicalStringGraphPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CompilationPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CompilationPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/CompilationPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/CompilationPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraalDebugHandlersFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/GraphPrinterDumpHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/printer/NoDeadCodeVerifyHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/AllocationSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/AllocationSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/AllocationSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/AllocationSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BigIntegerSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BoxingSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BoxingSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/BoxingSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/BoxingSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/CachingPEGraphDecoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ConstantBindingParameterPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DefaultJavaLoweringProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DimensionsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DimensionsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/DimensionsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/DimensionsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/GraphKit.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/GraphKit.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/GraphKit.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/GraphKit.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IdentityHashCodeSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InlineDuringParsingPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InstanceOfSnippetsTemplates.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IntrinsicGraphBuilder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/InvocationPluginHelper.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IsArraySnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IsArraySnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/IsArraySnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/IsArraySnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/JavacBug.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/JavacBug.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/JavacBug.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/JavacBug.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandlePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/MethodHandleWithExceptionPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeIntrinsificationProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeStrideUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NodeStrideUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/NonNullParameterPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PEGraphDecoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PEGraphDecoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/PartialIntrinsicCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/ReplacementsUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetCounterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetIntegerHistogram.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionInvocationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetSubstitutionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetTemplate.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetTemplate.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/SnippetTemplate.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/SnippetTemplate.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/Snippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/Snippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/Snippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/Snippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StandardGraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringHelperIntrinsics.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1InflateNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringLatin1Snippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16CompressNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/StringUTF16Snippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/TargetGraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64BitCountNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64GraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/aarch64/AArch64IntegerArithmeticSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64ConvertSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64FloatConvertNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64GraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/amd64/AMD64IntrinsicStubs.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyCallNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyLookup.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopySnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/arraycopy/ArrayCopyWithDelayedLoweringNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/Classfile.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/Classfile.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/Classfile.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/Classfile.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileBytecodeProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ClassfileConstantPool.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/classfile/ConstantPoolPatch.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/G1WriteBarrierSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/SerialWriteBarrierSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/gc/WriteBarrierSnippets.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AESNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AESNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AESNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AESNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCompareToNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayCopyWithConversionsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayEqualsWithMaskForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfMacroNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayIndexOfNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionCompareToNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ArrayRegionEqualsWithMaskNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/AssertionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicArrayCopyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BasicObjectCloneNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMulAddNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerMultiplyToLenNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BigIntegerSquareToLenNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BinaryMathIntrinsicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitCountNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanForwardNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/BitScanReverseNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CStringConstant.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesMacroNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CalcStringAttributesNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CipherBlockChainingAESNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountLeadingZerosNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountPositivesNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CountTrailingZerosNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/CounterModeAESNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/EncodeArrayNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ExplodeLoopNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FallbackInvokeWithExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FloatToHalfFloatNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ForeignCalls.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/FusedMultiplyAddNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/GHASHProcessBlocksNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/HalfFloatToFloatNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IdentityHashCodeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/IntrinsicMethodNodeInterface.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LoadSnippetVarargParameterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LogNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LogNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/LogNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/LogNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroInvokable.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MacroWithExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MemoryKillStubIntrinsicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MessageDigestNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/MethodHandleWithExceptionNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ObjectClone.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ProfileBooleanNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionMacroNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/PureFunctionStubIntrinsicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReadRegisterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReflectionGetCallerClassNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ResolvedMethodHandleCallTargetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBitsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ReverseBytesNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/UnaryMathIntrinsicNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedHashCodeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VectorizedMismatchNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/VirtualizableInvokeMacroNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/WriteRegisterNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/ZeroMemoryNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/BinaryIntegerExactArithmeticSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactOverflowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerAddExactSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactArithmeticSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerExactOverflowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactOverflowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerMulExactSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactOverflowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerNegExactSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactOverflowNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/IntegerSubExactSplitNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/replacements/nodes/arithmetic/UnsignedMulHighNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/runtime/RuntimeProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/runtime/RuntimeProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/runtime/RuntimeProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/runtime/RuntimeProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GlobalAtomicLong.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalServices.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalServices.java
similarity index 99%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalServices.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalServices.java
index 6026f1e9a1f9..94587b997dc7 100644
--- a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalServices.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalServices.java
@@ -123,8 +123,8 @@ public static  Iterable load(Class service) {
      */
     private static boolean isHotSpotGraalModule(String name) {
         if (name != null) {
-            return name.equals("jdk.internal.vm.compiler") ||
-                            name.equals("jdk.internal.vm.compiler.management") ||
+            return name.equals("jdk.compiler.graal") ||
+                            name.equals("jdk.compiler.graal.management") ||
                             name.equals("com.oracle.graal.graal_enterprise");
         }
         return false;
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/GraalUnsafeAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/IsolateUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JMXService.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JMXService.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JMXService.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JMXService.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/JavaVersionUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/OWNERS.toml b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/OWNERS.toml
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/ServiceProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationEncodingAdapter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/SpeculationReasonGroup.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/serviceprovider/UnencodedSpeculationReason.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/OWNERS.toml b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/OWNERS.toml
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/OWNERS.toml
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/OWNERS.toml
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/CollectionsUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/CollectionsUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/CollectionsUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/CollectionsUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/OptionsEncoder.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/OptionsEncoder.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/OptionsEncoder.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/OptionsEncoder.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataInputStream.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataInputStream.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataInputStream.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataInputStream.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataOutputStream.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataOutputStream.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/TypedDataOutputStream.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/TypedDataOutputStream.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONFormatter.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONFormatter.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONFormatter.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONFormatter.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParser.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParser.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParser.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParser.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParserException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParserException.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/util/json/JSONParserException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/util/json/JSONParserException.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsBlockState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsClosure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/EffectsPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/FinalPartialEscapePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/GraphEffectList.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ObjectState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationBlockState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PEReadEliminationClosure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeBlockState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapeClosure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/PartialEscapePhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationBlockState.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationClosure.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/ReadEliminationPhase.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualUtil.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/virtual/phases/ea/VirtualizerToolImpl.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/BarrieredAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/BarrieredAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/BarrieredAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/BarrieredAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/ObjectAccess.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/ObjectAccess.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/ObjectAccess.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/ObjectAccess.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/Word.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/Word.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/Word.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/Word.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordCastNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordCastNode.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordCastNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordCastNode.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordOperationPlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordOperationPlugin.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordOperationPlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordOperationPlugin.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordTypes.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordTypes.java
diff --git a/compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordVerificationImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordVerificationImpl.java
similarity index 100%
rename from compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/word/WordVerificationImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/word/WordVerificationImpl.java
diff --git a/docs/reference-manual/java/compiler.md b/docs/reference-manual/java/compiler.md
index 18a5211dcec8..b1b2b769bd0f 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.internal.vm.compiler/src/jdk/compiler/graal/core/phases/CEOptimization.java).
+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).
 
-The Graal compiler can bring performance advantages for highly-abstracted programs. For example, it includes a [partial-escape-analysis optimization](../../../compiler/src/jdk.internal.vm.compiler/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.compiler.graal/src/jdk/compiler/graal/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 5a96be091a52..65b4734fdafa 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.internal.vm.compiler       154.26kB byte[] for embedded resources
+   8.07kB jdk.compiler.graal             154.26kB byte[] for embedded resources
    1.39kB for 2 more packages              1.38MB for 884 more object types
 --------------------------------------------------------------------------------
 Recommendations:
diff --git a/sdk/mx.sdk/mx_sdk_vm.py b/sdk/mx.sdk/mx_sdk_vm.py
index 6c5011b03623..52f2c1c6c37c 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.internal.vm.compiler' in non_synthetic_modules:
+            if default_to_jvmci or 'jdk.compiler.graal' 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 196589bbbbe5..4546f94a5aca 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.internal.vm.compiler'
+                return '-J--add-exports=jdk.internal.vm.ci/jdk.vm.ci.code=jdk.compiler.graal'
             return ''
 
         def _get_add_exports():
diff --git a/sdk/mx.sdk/suite.py b/sdk/mx.sdk/suite.py
index f20abe2c2361..d7b92fafbbaa 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.internal.vm.compiler",
+            "org.graalvm.word.impl to jdk.compiler.graal",
         ],
         "uses" : [],
         "opens" : [],
diff --git a/substratevm/docs/module-system/ModuleSystemSupportHosted.md b/substratevm/docs/module-system/ModuleSystemSupportHosted.md
index 503017e3d04b..7f0616d64387 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.internal.vm.compiler/jdk.compiler.graal.options=ALL-UNNAMED`
+that runs the image builder. E.g. often `--add-exports=jdk.compiler.graal/jdk.compiler.graal.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 57841eab3bcf..5d75df69d081 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.internal.vm.compiler,org.graalvm.nativeimage.builder
+        --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.compiler.graal,org.graalvm.nativeimage.builder
         into:
         --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=ALL-UNNAMED
         """
@@ -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.internal.vm.compiler/jdk.compiler.graal.hotspot=ALL-UNNAMED',
-    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.options=ALL-UNNAMED',
-    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.truffle=ALL-UNNAMED',
-    '-J--add-exports=jdk.internal.vm.compiler/jdk.compiler.graal.truffle.hotspot=ALL-UNNAMED',
+    '-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=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',
@@ -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.internal.vm.compiler/jdk.compiler.graal.phases.common', 'jdk.internal.vm.ci/jdk.vm.ci.meta', 'jdk.internal.vm.ci/jdk.vm.ci.services', 'jdk.internal.vm.compiler/jdk.compiler.graal.core.common.util']
+    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']
     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 a6d423e8c9ea..98401406a52d 100644
--- a/substratevm/mx.substratevm/suite.py
+++ b/substratevm/mx.substratevm/suite.py
@@ -1412,7 +1412,7 @@
                 "exports" : [
                     "com.oracle.svm.hosted                        to java.base",
                     """* to org.graalvm.nativeimage.base,
-                            jdk.internal.vm.compiler,
+                            jdk.compiler.graal,
                             org.graalvm.nativeimage.driver,
                             org.graalvm.nativeimage.configure,
                             org.graalvm.nativeimage.librarysupport,
@@ -1432,13 +1432,13 @@
                             com.oracle.truffle.enterprise.svm""",
                 ],
                 "opens" : [
-                    "com.oracle.svm.core                          to jdk.internal.vm.compiler",
-                    "com.oracle.svm.core.nodes                    to jdk.internal.vm.compiler",
-                    "com.oracle.svm.core.graal.nodes              to jdk.internal.vm.compiler",
-                    "com.oracle.svm.core.graal.snippets           to jdk.internal.vm.compiler",
-                    "com.oracle.svm.hosted.fieldfolding           to jdk.internal.vm.compiler",
-                    "com.oracle.svm.hosted.phases                 to jdk.internal.vm.compiler",
-                    "com.oracle.svm.hosted.reflect                to jdk.internal.vm.compiler",
+                    "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",
                 ],
                 "requires": [
                     "java.management",
@@ -1620,12 +1620,12 @@
                     "* to org.graalvm.truffle.runtime.svm,com.oracle.truffle.enterprise.svm",
                 ],
                 "opens" : [
-                    "com.oracle.svm.truffle to org.graalvm.nativeimage.builder,jdk.internal.vm.compiler",
-                    "com.oracle.svm.truffle.nfi to org.graalvm.nativeimage.builder,jdk.internal.vm.compiler",
-                    "com.oracle.svm.truffle.nfi.windows to org.graalvm.nativeimage.builder,jdk.internal.vm.compiler",
-                    "com.oracle.svm.truffle.nfi.posix to org.graalvm.nativeimage.builder,jdk.internal.vm.compiler",
-                    "com.oracle.svm.truffle.api to org.graalvm.nativeimage.builder,jdk.internal.vm.compiler",
-                    "com.oracle.svm.truffle.isolated to org.graalvm.nativeimage.builder,jdk.internal.vm.compiler",
+                    "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",
                 ],
                 "requires": [
                     "java.management",
@@ -1945,7 +1945,7 @@
                         "jdk.vm.ci.code",
                         "jdk.vm.ci.runtime",
                     ],
-                    "jdk.internal.vm.compiler" : [
+                    "jdk.compiler.graal" : [
                         "jdk.compiler.graal.options"
                     ]
                 }
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 b82034e4f226..8d8b1ed82454 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
@@ -100,7 +100,7 @@
  *         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.internal.vm.compiler/jdk.compiler.graal.debug.GraalError.shouldNotReachHere(GraalError.java:57)
+ *         at jdk.compiler.graal/jdk.compiler.graal.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/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 290adf4e35ac..f52da55eaceb 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
@@ -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.internal.vm.compiler");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, false, "jdk.internal.vm.compiler.management");
+        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, "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.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java b/substratevm/src/com.oracle.svm.driver/src/com/oracle/svm/driver/APIOptionHandler.java
index 897d2e59ed5b..422083736ba1 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
@@ -621,7 +621,7 @@ final class APIOptionFeature implements Feature {
     @Override
     public void afterRegistration(AfterRegistrationAccess access) {
         ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, APIOptionFeature.class, true,
-                        "jdk.internal.vm.compiler", "jdk.compiler.graal.options");
+                        "jdk.compiler.graal", "jdk.compiler.graal.options");
     }
 
     @Override
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 46295fabe768..96b3ab60be74 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
@@ -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.internal.vm.compiler,org.graalvm.nativeimage.builder
+                     * --add-exports=jdk.internal.vm.ci/jdk.vm.ci.code.stack=jdk.compiler.graal,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.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 cfd12bd70125..5811c92df812 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
@@ -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.internal.vm.compiler");
-        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, LibGraalFeature.class, false, "jdk.internal.vm.compiler.management");
+        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, "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");
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 f133793f1a70..613b695d9248 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
@@ -652,7 +652,7 @@ private void run() {
                 }, 5, 1, TimeUnit.MINUTES);
 
                 List requiresInit = new ArrayList<>(Arrays.asList(
-                                "jdk.internal.vm.ci", "jdk.internal.vm.compiler", "com.oracle.graal.graal_enterprise",
+                                "jdk.internal.vm.ci", "jdk.compiler.graal", "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/NativeImageGeneratorRunner.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/NativeImageGeneratorRunner.java
index 8fbe68569445..d59eb31b6f12 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
@@ -226,9 +226,10 @@ private static void transitiveRequires(boolean verbose, Module requiringModule,
         for (Module potentialNeedModule : potentialNeededModules) {
             if (requiringModule.canRead(potentialNeedModule)) {
                 /* Filter out GraalVM modules */
-                if (potentialNeedModule.getName().startsWith("jdk.internal.vm.c") || /* JVMCI */
+                if (potentialNeedModule.getName().equals("jdk.internal.vm.ci") || /* JVMCI */
                                 /* graal */
                                 potentialNeedModule.getName().startsWith("org.graalvm.") ||
+                                potentialNeedModule.getName().startsWith("jdk.compiler.graal") ||
                                 /* enterprise graal */
                                 potentialNeedModule.getName().startsWith("com.oracle.graal.") ||
                                 /* exclude all truffle modules */
@@ -742,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.internal.vm.compiler");
-            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, null, true, "jdk.internal.vm.compiler.management");
+            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, 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/image/sources/SourceCache.java b/substratevm/src/com.oracle.svm.hosted/src/com/oracle/svm/hosted/image/sources/SourceCache.java
index cb0d7ce912f6..5c039934c5c7 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
@@ -75,7 +75,7 @@ private static class SourceRoots {
          */
         private static final String[] specialRootModules = {
                         "jdk.internal.vm.ci",
-                        "jdk.internal.vm.compiler",
+                        "jdk.compiler.graal",
         };
 
         /**
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 d50f0df77983..8c57bc2c63d0 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
@@ -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.internal.vm.compiler", "jdk.compiler.graal.nodes");
+            ModuleSupport.accessPackagesToClass(ModuleSupport.Access.OPEN, accessingClass, false, "jdk.compiler.graal", "jdk.compiler.graal.nodes");
             return super.applyInvocationPlugin(invokeKind, args, targetMethod, resultType, plugin);
         }
 
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 95c306032d74..8741269d3ed1 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.internal.vm.compiler");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, null, true, "jdk.compiler.graal");
         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.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 3260ec07bee3..04b1f61be285 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
@@ -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.internal.vm.compiler", "jdk.compiler.graal.nodes");
+        ModuleSupport.accessPackagesToClass(ModuleSupport.Access.EXPORT, ScalaFeature.class, false, "jdk.compiler.graal", "jdk.compiler.graal.nodes");
     }
 
     @Override
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 c8e46b4aaaf6..dea7b7e68a81 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.internal.vm.compiler/jdk.compiler.graal.debug=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.graph=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.nodes=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.nodes.java=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.options=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 org.graalvm.truffle.runtime/com.oracle.truffle.runtime=ALL-UNNAMED \
-           --add-exports jdk.internal.vm.compiler/jdk.compiler.graal.util.json=ALL-UNNAMED \
+           --add-exports jdk.compiler.graal/jdk.compiler.graal.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/truffle/docs/HostCompilation.md b/truffle/docs/HostCompilation.md
index ed553bd77bbd..4da7711af84d 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](../../compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java).
+The source code for this phase can be found in [HostInliningPhase](../../compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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. 
diff --git a/truffle/docs/Inlining.md b/truffle/docs/Inlining.md
index 9af4007c65d1..5609510fe0d9 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.internal.vm.compiler/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java) in the inline [call tree](../../compiler/src/jdk.internal.vm.compiler/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java)
+[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)
 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/mx.truffle/suite.py b/truffle/mx.truffle/suite.py
index 4873a09ac546..fab691d921f3 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.internal.vm.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.internal.vm.compiler",
-          "com.oracle.truffle.compiler.hotspot.libgraal to org.graalvm.truffle.runtime, jdk.internal.vm.compiler"
+          "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"
         ],
         "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.internal.vm.compiler",
+          "com.oracle.truffle.runtime.hotspot to jdk.compiler.graal",
         ],
         "uses" : [
           "com.oracle.truffle.api.impl.TruffleLocator",
@@ -1992,7 +1992,7 @@
       "moduleInfo" : {
         "name" : "org.graalvm.locator",
         "exports" : [
-          "com.oracle.graalvm.locator to jdk.internal.vm.compiler.management",
+          "com.oracle.graalvm.locator to jdk.compiler.graal.management",
         ],
       },
       "dependencies": ["com.oracle.graalvm.locator"],
diff --git a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ObjectSizeEstimate.java b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ObjectSizeEstimate.java
index cfc5285a2efc..a389cdae27f4 100644
--- a/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ObjectSizeEstimate.java
+++ b/truffle/src/com.oracle.truffle.api.dsl.test/src/com/oracle/truffle/api/dsl/test/ObjectSizeEstimate.java
@@ -56,10 +56,6 @@
  * The methods {@link #getTotalBytes()} and {@link #getCompressedTotalBytes()} estimate the total
  * number of bytes occupied. The real number of bytes occupied may vary due to different alignment
  * or different header sizes on different virtual machines.
- *
- * 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.internal.vm.compiler}).
  */
 public final class ObjectSizeEstimate {
 
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 886d133f92fe..6526bc99d13a 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,10 +1034,10 @@ private static  List> loadService(Class service) {
         } else {
             ServiceLoader runtimeLoader = ServiceLoader.load(service, runtimeClassLoader);
             /*
-             * The Graal module (i.e., jdk.internal.vm.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.
+             * The Graal module (i.e., jdk.compiler.graal) 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.
              */
             return List.of(runtimeLoader, appLoader);
         }
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 dede16792b1f..7910831b111c 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
@@ -102,7 +102,8 @@ protected static TruffleRuntime createRuntime() {
          * We also need to do this for LibGraal as the truffle.compiler module may be installed as
          * part of the JDK if the JDK supports running with jar graal as well.
          */
-        Module truffleCompilerModule = HotSpotTruffleRuntimeAccess.class.getModule().getLayer().findModule("org.graalvm.truffle.compiler").orElse(null);
+        ModuleLayer layer = HotSpotTruffleRuntimeAccess.class.getModule().getLayer();
+        Module truffleCompilerModule = layer.findModule("org.graalvm.truffle.compiler").orElse(null);
         if (truffleCompilerModule == null) {
             return new DefaultTruffleRuntime("Truffle compiler module is missing. This is likely an installation error.");
         }
@@ -116,7 +117,7 @@ protected static TruffleRuntime createRuntime() {
         } else {
             // try jar graal
             try {
-                Module compilerModule = HotSpotTruffleRuntimeAccess.class.getModule().getLayer().findModule("jdk.internal.vm.compiler").orElse(null);
+                Module compilerModule = layer.findModule("jdk.compiler.graal").or(() -> layer.findModule("jdk.internal.vm.compiler")).orElse(null);
                 if (compilerModule == null) {
                     // jargraal compiler module not found -> fallback to default runtime
                     return new DefaultTruffleRuntime(
diff --git a/vm/mx.vm/mx_vm_gate.py b/vm/mx.vm/mx_vm_gate.py
index 3ba32258a996..c3642f78ce30 100644
--- a/vm/mx.vm/mx_vm_gate.py
+++ b/vm/mx.vm/mx_vm_gate.py
@@ -87,7 +87,7 @@ def _unittest_config_participant(config):
 mx_unittest.add_config_participant(_unittest_config_participant)
 
 def _get_CountUppercase_vmargs():
-    cp = mx.project("jdk.internal.vm.compiler.test").classpath_repr()
+    cp = mx.project("jdk.compiler.graal.test").classpath_repr()
     return ['-cp', cp, 'jdk.compiler.graal.test.CountUppercase']
 
 def _check_compiler_log(compiler_log_file, expectations, extra_check=None, extra_log_files=None):

From cc8fb7e45d54d4a6069b2572d812bebfdc6f9703 Mon Sep 17 00:00:00 2001
From: Doug Simon 
Date: Fri, 13 Oct 2023 21:08:27 +0200
Subject: [PATCH 5/6] move jdk.compiler.graal.truffle.compiler.* to
 jdk.compiler.graal.truffle.*

---
 .../graal/core/test/CheckGraalInvariants.java |  2 +-
 .../graal/core/test/OptionsVerifierTest.java  |  2 +-
 .../graal/core/test/VerifyDebugUsage.java     |  6 +--
 .../test/AgnosticInliningPhaseTest.java       | 10 ++--
 .../test/ArrayUtilsIndexOfWithMaskTest.java   |  2 +-
 ...UtilsRegionEqualsWithMaskConstantTest.java |  2 +-
 .../ArrayUtilsRegionEqualsWithMaskTest.java   |  2 +-
 .../graal/truffle/test/ArrayUtilsTest.java    |  2 +-
 .../test/CompilerDirectivesTypeTest.java      |  4 +-
 .../truffle/test/CompilerLoggingTest.java     |  2 +-
 .../truffle/test/ConditionAnchoringTest.java  |  4 +-
 .../DynamicObjectPartialEvaluationTest.java   |  2 +-
 .../truffle/test/EncodedGraphCacheTest.java   |  6 +--
 .../graal/truffle/test/ExactMathTest.java     |  2 +-
 .../graal/truffle/test/HostInliningTest.java  |  2 +-
 .../test/InstrumentBranchesPhaseTest.java     |  4 +-
 .../truffle/test/PartialEvaluationTest.java   | 14 +++---
 .../truffle/test/PerformanceWarningTest.java  |  4 +-
 .../graal/truffle/test/PhiTransformTest.java  |  4 +-
 .../truffle/test/TruffleCompilerImplTest.java |  6 +--
 .../libgraal/JNIExceptionWrapperTest.java     |  2 +-
 .../truffle/test/strings/TStringTest.java     |  2 +-
 .../AbstractKnownTruffleTypes.java            |  2 +-
 .../AbstractTruffleCompilationSupport.java    |  2 +-
 ...ommunityPartialEvaluatorConfiguration.java |  2 +-
 .../EconomyPartialEvaluatorConfiguration.java |  2 +-
 .../{compiler => }/ExpansionStatistics.java   |  2 +-
 .../GraphTooBigBailoutException.java          |  2 +-
 .../{compiler => }/KnownTruffleTypes.java     |  2 +-
 .../PEAgnosticInlineInvokePlugin.java         |  2 +-
 .../ParsingInlineInvokePlugin.java            |  2 +-
 .../{compiler => }/PartialEvaluator.java      | 10 ++--
 .../PartialEvaluatorConfiguration.java        |  4 +-
 .../PerformanceInformationHandler.java        |  4 +-
 .../PostPartialEvaluationSuite.java           |  6 +--
 .../{compiler => }/SuppressFBWarnings.java    |  2 +-
 .../truffle/{compiler => }/TruffleAST.java    |  6 +--
 .../{compiler => }/TruffleCompilation.java    |  2 +-
 .../TruffleCompilationIdentifier.java         |  2 +-
 .../TruffleCompilerConfiguration.java         |  2 +-
 .../{compiler => }/TruffleCompilerImpl.java   | 12 ++---
 .../TruffleCompilerOptions.java               |  2 +-
 .../TruffleConstantFieldProvider.java         |  2 +-
 .../TruffleDebugHandlersFactory.java          |  2 +-
 .../TruffleDebugJavaMethod.java               |  2 +-
 .../{compiler => }/TruffleElementCache.java   |  2 +-
 .../{compiler => }/TruffleInliningScope.java  |  4 +-
 .../TruffleStringConstantFieldProvider.java   |  2 +-
 .../TruffleTierConfiguration.java             |  4 +-
 .../{compiler => }/TruffleTierContext.java    |  4 +-
 .../host/HostInliningPhase.java               |  6 +--
 .../host/InjectImmutableFrameFieldsPhase.java |  2 +-
 .../host/TruffleHostEnvironment.java          |  6 +--
 .../host/TruffleKnownHostTypes.java           |  6 +--
 .../hotspot/HotSpotKnownTruffleTypes.java     |  4 +-
 .../hotspot/HotSpotPartialEvaluator.java      |  8 ++--
 .../HotSpotTruffleCompilationIdentifier.java  |  4 +-
 .../HotSpotTruffleCompilationSupport.java     |  4 +-
 .../hotspot/HotSpotTruffleCompilerImpl.java   | 16 +++----
 .../HotSpotTruffleGraphBuilderPlugins.java    |  2 +-
 .../HotSpotTruffleHostEnvironment.java        |  8 ++--
 .../HotSpotTruffleHostEnvironmentLookup.java  |  4 +-
 .../HotSpotTruffleLoweringExtensions.java     |  5 +-
 ...otSpotTruffleSafepointLoweringSnippet.java |  6 +--
 ...fleCallBoundaryInstrumentationFactory.java |  4 +-
 ...TruffleCommunityCompilerConfiguration.java |  8 ++--
 ...CommunityCompilerConfigurationFactory.java |  2 +-
 .../hotspot/TruffleEntryPointDecorator.java   |  4 +-
 ...fleCallBoundaryInstrumentationFactory.java |  8 ++--
 ...fleCallBoundaryInstrumentationFactory.java |  8 ++--
 .../{compiler => }/nodes/AnyExtendNode.java   |  2 +-
 .../nodes/IsCompilationConstantNode.java      |  2 +-
 .../nodes/ObjectLocationIdentity.java         |  2 +-
 .../nodes/SpeculativeExceptionAnchorNode.java |  4 +-
 .../nodes/TruffleAssumption.java              |  2 +-
 .../nodes/TruffleSafepointNode.java           |  2 +-
 .../asserts/NeverPartOfCompilationNode.java   |  2 +-
 .../nodes/frame/AllowMaterializeNode.java     |  2 +-
 .../nodes/frame/ForceMaterializeNode.java     |  2 +-
 .../nodes/frame/NewFrameNode.java             |  4 +-
 .../nodes/frame/VirtualFrameAccessFlags.java  |  2 +-
 .../nodes/frame/VirtualFrameAccessType.java   |  2 +-
 .../VirtualFrameAccessVerificationNode.java   |  4 +-
 .../nodes/frame/VirtualFrameAccessorNode.java |  2 +-
 .../nodes/frame/VirtualFrameClearNode.java    |  2 +-
 .../nodes/frame/VirtualFrameCopyNode.java     |  2 +-
 .../nodes/frame/VirtualFrameGetNode.java      |  2 +-
 .../nodes/frame/VirtualFrameGetTagNode.java   |  2 +-
 .../nodes/frame/VirtualFrameIsNode.java       |  2 +-
 .../nodes/frame/VirtualFrameSetNode.java      |  2 +-
 .../nodes/frame/VirtualFrameSwapNode.java     |  2 +-
 .../phases/DeoptimizeOnExceptionPhase.java    |  4 +-
 .../phases/FrameAccessVerificationPhase.java  | 18 +++----
 .../InliningAcrossTruffleBoundaryPhase.java   |  4 +-
 .../phases/InstrumentBranchesPhase.java       |  4 +-
 .../phases/InstrumentPhase.java               | 18 +++----
 .../InstrumentTruffleBoundariesPhase.java     |  4 +-
 .../phases/InstrumentationSuite.java          |  4 +-
 .../phases/MaterializeFramesPhase.java        |  6 +--
 .../phases/NeverPartOfCompilationPhase.java   |  6 +--
 .../phases/PhiTransformPhase.java             |  4 +-
 .../ReportPerformanceWarningsPhase.java       |  4 +-
 .../phases/SetIdentityForValueTypesPhase.java |  4 +-
 .../phases/TruffleCompilerPhases.java         |  4 +-
 .../TruffleLoopSafepointEliminationPhase.java |  4 +-
 .../TruffleSafepointInsertionPhase.java       |  8 ++--
 .../{compiler => }/phases/TruffleTier.java    | 12 ++---
 .../phases/VerifyFrameDoesNotEscapePhase.java |  6 +--
 .../inlining/AgnosticInliningPhase.java       | 12 ++---
 .../phases/inlining/CallNode.java             |  8 ++--
 .../phases/inlining/CallTree.java             | 10 ++--
 .../inlining/DefaultInliningPolicy.java       |  4 +-
 .../DefaultInliningPolicyProvider.java        |  2 +-
 .../phases/inlining/GraphManager.java         | 16 +++----
 .../phases/inlining/InliningPolicy.java       |  4 +-
 .../inlining/InliningPolicyProvider.java      |  2 +-
 .../phases/inlining/NoInliningPolicy.java     |  2 +-
 .../inlining/NoInliningPolicyProvider.java    |  2 +-
 .../inlining/TrivialOnlyInliningPolicy.java   |  4 +-
 .../inlining/TrivialOnlyPolicyProvider.java   |  2 +-
 .../GraphBuilderInvocationPluginProvider.java |  4 +-
 .../GraphDecoderInvocationPluginProvider.java |  2 +-
 .../TruffleGraphBuilderPlugins.java           | 48 +++++++++----------
 .../TruffleInvocationPlugins.java             |  2 +-
 .../svm/core/meta/ObjectConstantEquality.java |  2 +-
 .../hotspot/libgraal/LibGraalFeature.java     | 12 ++---
 .../LibGraalTruffleHostEnvironment.java       |  8 ++--
 .../LibGraalTruffleHostEnvironmentLookup.java |  2 +-
 .../truffle/TruffleLibGraalFeature.java       |  2 +-
 .../truffle/TruffleToLibGraalEntryPoints.java |  6 +--
 .../LegacyRuntimeCompilationFeature.java      |  2 +-
 .../ParseOnceRuntimeCompilationFeature.java   |  2 +-
 .../svm/graal/meta/RuntimeCodeInstaller.java  |  2 +-
 .../truffle/SubstrateHostInliningPhase.java   |  4 +-
 ...SubstrateTruffleCompilationIdentifier.java |  2 +-
 .../SubstrateTruffleHostEnvironment.java      |  6 +--
 ...SubstrateTruffleHostEnvironmentLookup.java |  2 +-
 .../svm/truffle/TruffleBaseFeature.java       |  6 +--
 .../oracle/svm/truffle/TruffleFeature.java    | 10 ++--
 .../oracle/svm/truffle/TruffleSupport.java    | 10 ++--
 .../api/SubstrateKnownTruffleTypes.java       |  2 +-
 ...trateOptimizedCallTargetInstalledCode.java |  2 +-
 .../api/SubstratePartialEvaluator.java        |  8 ++--
 .../SubstratePostPartialEvaluationSuite.java  |  2 +-
 ...SubstrateThreadLocalHandshakeSnippets.java |  2 +-
 .../SubstrateTruffleCompilationSupport.java   |  2 +-
 .../truffle/api/SubstrateTruffleCompiler.java |  4 +-
 .../api/SubstrateTruffleCompilerImpl.java     | 16 +++----
 .../svm/truffle/api/TruffleBoundaryPhase.java |  2 +-
 .../isolated/IsolateAwareTruffleCompiler.java |  6 +--
 .../IsolatedTruffleCompilationIdentifier.java |  2 +-
 151 files changed, 352 insertions(+), 353 deletions(-)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/AbstractKnownTruffleTypes.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/AbstractTruffleCompilationSupport.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/CommunityPartialEvaluatorConfiguration.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/EconomyPartialEvaluatorConfiguration.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/ExpansionStatistics.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/GraphTooBigBailoutException.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/KnownTruffleTypes.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PEAgnosticInlineInvokePlugin.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/ParsingInlineInvokePlugin.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PartialEvaluator.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PartialEvaluatorConfiguration.java (93%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PerformanceInformationHandler.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/PostPartialEvaluationSuite.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/SuppressFBWarnings.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleAST.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilation.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilationIdentifier.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilerConfiguration.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilerImpl.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleCompilerOptions.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleConstantFieldProvider.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleDebugHandlersFactory.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleDebugJavaMethod.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleElementCache.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleInliningScope.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleStringConstantFieldProvider.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleTierConfiguration.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/TruffleTierContext.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/HostInliningPhase.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/InjectImmutableFrameFieldsPhase.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/TruffleHostEnvironment.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/host/TruffleKnownHostTypes.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotKnownTruffleTypes.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotPartialEvaluator.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleCompilationIdentifier.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleCompilationSupport.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleCompilerImpl.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleGraphBuilderPlugins.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleHostEnvironment.java (92%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleHostEnvironmentLookup.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleLoweringExtensions.java (87%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/HotSpotTruffleSafepointLoweringSnippet.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleCallBoundaryInstrumentationFactory.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleCommunityCompilerConfiguration.java (92%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleCommunityCompilerConfigurationFactory.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/TruffleEntryPointDecorator.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/AnyExtendNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/IsCompilationConstantNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/ObjectLocationIdentity.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/SpeculativeExceptionAnchorNode.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/TruffleAssumption.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/TruffleSafepointNode.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/asserts/NeverPartOfCompilationNode.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/AllowMaterializeNode.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/ForceMaterializeNode.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/NewFrameNode.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessFlags.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessType.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessVerificationNode.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameAccessorNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameClearNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameCopyNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameGetNode.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameGetTagNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameIsNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameSetNode.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/nodes/frame/VirtualFrameSwapNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/DeoptimizeOnExceptionPhase.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/FrameAccessVerificationPhase.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InliningAcrossTruffleBoundaryPhase.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentBranchesPhase.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentPhase.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentTruffleBoundariesPhase.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/InstrumentationSuite.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/MaterializeFramesPhase.java (90%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/NeverPartOfCompilationPhase.java (92%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/PhiTransformPhase.java (99%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/ReportPerformanceWarningsPhase.java (93%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/SetIdentityForValueTypesPhase.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleCompilerPhases.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleLoopSafepointEliminationPhase.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleSafepointInsertionPhase.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/TruffleTier.java (84%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/VerifyFrameDoesNotEscapePhase.java (93%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/AgnosticInliningPhase.java (92%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/CallNode.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/CallTree.java (93%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/DefaultInliningPolicy.java (98%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/DefaultInliningPolicyProvider.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/GraphManager.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/InliningPolicy.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/InliningPolicyProvider.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/NoInliningPolicy.java (95%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/NoInliningPolicyProvider.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/TrivialOnlyInliningPolicy.java (93%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/phases/inlining/TrivialOnlyPolicyProvider.java (96%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/GraphBuilderInvocationPluginProvider.java (94%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/GraphDecoderInvocationPluginProvider.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/TruffleGraphBuilderPlugins.java (97%)
 rename compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/{compiler => }/substitutions/TruffleInvocationPlugins.java (99%)

diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
index 94a6d22ca54d..fdcf373b4b29 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/CheckGraalInvariants.java
@@ -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.compiler.TruffleCompilerOptions")) {
+            if (declaringClass.getName().equals("jdk.compiler.graal.truffle.TruffleCompilerOptions")) {
                 /*
                  * These options are deprecated and will be removed in GraalVM 20.2.0. The
                  * TruffleIntrinsifyFrameAccess option has no replacement and is unused.
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
index d41572a450a3..a52afad76303 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/OptionsVerifierTest.java
@@ -56,7 +56,7 @@
 public class OptionsVerifierTest {
 
     private static Set ALLOWLIST = new TreeSet<>(Arrays.asList(//
-                    "jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions"));
+                    "jdk.compiler.graal.truffle.TruffleCompilerOptions"));
 
     @Test
     public void verifyOptions() throws IOException {
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
index dc52a3959f67..16a5faec6a4f 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/core/test/VerifyDebugUsage.java
@@ -50,9 +50,9 @@
 import jdk.compiler.graal.replacements.ReplacementsImpl;
 import jdk.compiler.graal.replacements.SnippetTemplate;
 import jdk.compiler.graal.test.GraalTest.MethodSource;
-import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.phases.inlining.CallTree;
 import jdk.vm.ci.meta.Constant;
 import jdk.vm.ci.meta.MetaAccessProvider;
 import jdk.vm.ci.meta.PrimitiveConstant;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
index 0f2d105d207d..ce97555ea78e 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/AgnosticInliningPhaseTest.java
@@ -26,11 +26,11 @@
 
 import jdk.compiler.graal.core.common.CompilationIdentifier;
 import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase;
 import org.graalvm.polyglot.Context;
 import org.junit.Before;
 
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
index 86920f7c6f6d..c5a296f9e774 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsIndexOfWithMaskTest.java
@@ -29,7 +29,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
index 180eea974fe2..24170f6ad61d 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskConstantTest.java
@@ -33,7 +33,7 @@
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.replacements.nodes.ArrayRegionEqualsNode;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
index 434eb8d7017e..d2e71ca10514 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsRegionEqualsWithMaskTest.java
@@ -28,7 +28,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
index 61d8ad1424e2..d9caba5d3a16 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ArrayUtilsTest.java
@@ -28,7 +28,7 @@
 
 import jdk.compiler.graal.core.test.GraalCompilerTest;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
index adb7dfcf4a77..01659823f1d1 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerDirectivesTypeTest.java
@@ -26,8 +26,8 @@
 
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Test;
 
 import com.oracle.truffle.api.CompilerDirectives;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
index a0168a6fb9d6..b1cb14035b2e 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/CompilerLoggingTest.java
@@ -36,7 +36,7 @@
 import com.oracle.truffle.api.TruffleOptions;
 import com.oracle.truffle.api.frame.VirtualFrame;
 import jdk.compiler.graal.debug.TTY;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Assume;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
index b2abf89d8f17..d26b14b986b7 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ConditionAnchoringTest.java
@@ -54,8 +54,8 @@
 import jdk.compiler.graal.phases.common.FloatingReadPhase;
 import jdk.compiler.graal.phases.common.HighTierLoweringPhase;
 import jdk.compiler.graal.phases.common.LoweringPhase;
-import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Test;
 
 import jdk.vm.ci.meta.JavaKind;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
index 54459acefd47..18eb1078cbfb 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/DynamicObjectPartialEvaluationTest.java
@@ -35,7 +35,7 @@
 import jdk.compiler.graal.nodes.extended.UnsafeAccessNode;
 import jdk.compiler.graal.nodes.java.LoadFieldNode;
 import jdk.compiler.graal.nodes.java.StoreFieldNode;
-import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
+import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
index 5ea3c57118d0..25a089c62c86 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/EncodedGraphCacheTest.java
@@ -34,9 +34,9 @@
 import org.graalvm.collections.EconomicMap;
 import jdk.compiler.graal.debug.DebugContext;
 import jdk.compiler.graal.nodes.EncodedGraph;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
index 16ea367864ff..c051180dcb0f 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/ExactMathTest.java
@@ -26,7 +26,7 @@
 
 import jdk.compiler.graal.nodes.calc.RoundNode;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.junit.Assert;
 import org.junit.Assume;
 import org.junit.Test;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
index 8882b7ea5f94..dd3a5c833cb4 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/HostInliningTest.java
@@ -55,7 +55,7 @@
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.phases.common.CanonicalizerPhase;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
+import jdk.compiler.graal.truffle.host.HostInliningPhase;
 import jdk.compiler.graal.truffle.test.HostInliningTestFactory.IfNodeGen;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
index e4168b579540..f2495ce3dc11 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/InstrumentBranchesPhaseTest.java
@@ -30,8 +30,8 @@
 import jdk.compiler.graal.api.directives.GraalDirectives;
 import jdk.compiler.graal.truffle.test.nodes.AbstractTestNode;
 import jdk.compiler.graal.truffle.test.nodes.RootTestNode;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.phases.InstrumentPhase;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
index fa109ae4c6d2..796bd9c649e9 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PartialEvaluationTest.java
@@ -44,13 +44,13 @@
 import jdk.compiler.graal.phases.PhaseSuite;
 import jdk.compiler.graal.phases.common.DeadCodeEliminationPhase;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleDebugJavaMethod;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.phases.TruffleTier;
 import org.junit.Assert;
 
 import com.oracle.truffle.api.CallTarget;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
index ddae1cd5d50a..2d471f24dfc8 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PerformanceWarningTest.java
@@ -29,8 +29,8 @@
 import jdk.compiler.graal.debug.DebugCloseable;
 import jdk.compiler.graal.debug.DebugContext;
 import jdk.compiler.graal.debug.DebugContext.Builder;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.Assert;
 import org.junit.Before;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
index 36e8037398ce..e77caded135e 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/PhiTransformTest.java
@@ -41,8 +41,8 @@
 import jdk.compiler.graal.phases.BasePhase;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
 import jdk.compiler.graal.phases.tiers.Suites;
-import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode;
-import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase;
+import jdk.compiler.graal.truffle.nodes.AnyExtendNode;
+import jdk.compiler.graal.truffle.phases.PhiTransformPhase;
 import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
index dce997e85277..0ad0fbe9504c 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/TruffleCompilerImplTest.java
@@ -30,9 +30,9 @@
 import jdk.compiler.graal.core.common.CompilationIdentifier;
 import jdk.compiler.graal.core.target.Backend;
 import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import org.graalvm.polyglot.Context;
 import org.junit.After;
 import org.junit.Assume;
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
index fdb3c606c6f0..444e20f4cb8a 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/libgraal/JNIExceptionWrapperTest.java
@@ -36,7 +36,7 @@
 import jdk.compiler.graal.core.CompilationWrapper;
 import jdk.compiler.graal.core.GraalCompilerOptions;
 import jdk.compiler.graal.test.SubprocessUtil;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
 import jdk.compiler.graal.truffle.test.TestWithPolyglotOptions;
 import org.junit.Test;
 
diff --git a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
index 4f979c19e4d1..c78ecf374a3f 100644
--- a/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
+++ b/compiler/src/jdk.compiler.graal.test/src/jdk/compiler/graal/truffle/test/strings/TStringTest.java
@@ -37,7 +37,7 @@
 import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderConfiguration;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.replacements.ConstantBindingParameterPlugin;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 
 import jdk.vm.ci.aarch64.AArch64;
 import jdk.vm.ci.amd64.AMD64;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java
index aa2de90bf242..8ccce536bbf0 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractKnownTruffleTypes.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractKnownTruffleTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/AbstractTruffleCompilationSupport.java
index 0200666aad78..e707b60c77ad 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/AbstractTruffleCompilationSupport.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.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/compiler/CommunityPartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java
index 659356612c05..ad9b2d4da551 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/CommunityPartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/CommunityPartialEvaluatorConfiguration.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java
index cf793815a824..be45650f4f32 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/EconomyPartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/EconomyPartialEvaluatorConfiguration.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.serviceprovider.ServiceProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java
index f81ebcfcd30f..87b42f4e169e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ExpansionStatistics.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ExpansionStatistics.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.io.PrintWriter;
 import java.io.StringWriter;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java
index b1f4373c96f8..d414a09ddc4b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/GraphTooBigBailoutException.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/GraphTooBigBailoutException.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.core.common.PermanentBailoutException;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java
index 4e299d6f68da..02abe832de46 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/KnownTruffleTypes.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/KnownTruffleTypes.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.lang.invoke.MethodHandle;
 import java.lang.ref.Reference;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java
index 8c171756df32..1b01c2049262 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PEAgnosticInlineInvokePlugin.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PEAgnosticInlineInvokePlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java
index 747914d6ca43..13c327ed23f3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/ParsingInlineInvokePlugin.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/ParsingInlineInvokePlugin.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.nodes.ValueNode;
 import jdk.compiler.graal.nodes.graphbuilderconf.GraphBuilderContext;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java
index d89809540ac0..2fc39d5d2598 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluator.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluator.java
@@ -22,16 +22,16 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.net.URI;
 import java.nio.Buffer;
 import java.util.function.Supplier;
 
-import jdk.compiler.graal.truffle.compiler.phases.DeoptimizeOnExceptionPhase;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleGraphBuilderPlugins;
+import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.truffle.phases.InstrumentPhase;
+import jdk.compiler.graal.truffle.substitutions.GraphBuilderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.TruffleGraphBuilderPlugins;
 import org.graalvm.collections.EconomicMap;
 import jdk.compiler.graal.core.common.type.StampPair;
 import jdk.compiler.graal.graph.Graph;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java
index 621046288954..cb2b3744044d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PartialEvaluatorConfiguration.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PartialEvaluatorConfiguration.java
@@ -22,9 +22,9 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
+import jdk.compiler.graal.truffle.substitutions.GraphDecoderInvocationPluginProvider;
 import jdk.vm.ci.code.Architecture;
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.phases.util.Providers;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PerformanceInformationHandler.java
index f8c4eedd5e63..ce8dc65a31b3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PerformanceInformationHandler.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.io.Closeable;
 import java.util.ArrayList;
@@ -33,7 +33,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.truffle.phases.TruffleTier;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.Equivalence;
 import org.graalvm.collections.MapCursor;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java
index 3e030bbc168f..2ce32cbacc3d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/PostPartialEvaluationSuite.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/PostPartialEvaluationSuite.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.loop.phases.ConvertDeoptimizeToGuardPhase;
 import jdk.compiler.graal.nodes.StructuredGraph;
@@ -33,8 +33,8 @@
 import jdk.compiler.graal.phases.common.CanonicalizerPhase;
 import jdk.compiler.graal.phases.common.ConditionalEliminationPhase;
 import jdk.compiler.graal.phases.common.inlining.InliningUtil;
-import jdk.compiler.graal.truffle.compiler.phases.FrameAccessVerificationPhase;
-import jdk.compiler.graal.truffle.compiler.phases.PhiTransformPhase;
+import jdk.compiler.graal.truffle.phases.FrameAccessVerificationPhase;
+import jdk.compiler.graal.truffle.phases.PhiTransformPhase;
 import jdk.compiler.graal.virtual.phases.ea.PartialEscapePhase;
 
 public class PostPartialEvaluationSuite extends PhaseSuite {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/SuppressFBWarnings.java
index 0d2f11a3ba56..6528d372b1fc 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/SuppressFBWarnings.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.lang.annotation.Retention;
 import java.lang.annotation.RetentionPolicy;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleAST.java
index b0304701a09a..66458e589018 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleAST.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -36,8 +36,8 @@
 import jdk.compiler.graal.graph.NodeSourcePosition;
 import jdk.compiler.graal.nodes.ConstantNode;
 import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.CallNode;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree;
+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;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java
index f82a8818ed78..a0a47db69427 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilation.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilation.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.function.Consumer;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java
index a8b4a78b40c8..883a02da2944 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilationIdentifier.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilationIdentifier.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.core.common.CompilationIdentifier;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java
index c64dfb33a187..64ca3bed960d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerConfiguration.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerConfiguration.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java
index 22d8c765e07e..1b3643777658 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerImpl.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerImpl.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import static jdk.vm.ci.runtime.JVMCICompiler.INVOCATION_ENTRY_BCI;
 import static jdk.compiler.graal.core.CompilationWrapper.ExceptionAction.Diagnose;
@@ -42,11 +42,11 @@
 import java.util.function.Consumer;
 
 import jdk.compiler.graal.graph.Node;
-import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode;
-import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentPhase;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentationSuite;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+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 org.graalvm.collections.EconomicMap;
 import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
 import jdk.compiler.graal.code.CompilationResult;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleCompilerOptions.java
index 5454280cf3a3..480d3b484fc5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleCompilerOptions.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java
index c18a24e1580d..687a4bdd3a2e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleConstantFieldProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleConstantFieldProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java
index d4a3db1d27e9..49ce4bc2d731 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugHandlersFactory.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugHandlersFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.io.IOException;
 import java.util.HashMap;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleDebugJavaMethod.java
index f31f002155bb..e6f7dc59927f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleDebugJavaMethod.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.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/compiler/TruffleElementCache.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java
index 3c11920b5461..0c3690b3d498 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleElementCache.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleElementCache.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.Collections;
 import java.util.LinkedHashMap;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleInliningScope.java
index 47bfb51b4e7c..ae471204ae3f 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleInliningScope.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.io.Closeable;
 
 import jdk.compiler.graal.debug.DebugContext;
 import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.CallTree;
+import jdk.compiler.graal.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/compiler/TruffleStringConstantFieldProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java
index 511a8ff89f3d..53d7fc1800de 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleStringConstantFieldProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleStringConstantFieldProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import jdk.compiler.graal.core.common.spi.ConstantFieldProvider;
 import jdk.compiler.graal.phases.util.Providers;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierConfiguration.java
index 5af707b99d8e..de1a6c26b711 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierConfiguration.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler;
+package jdk.compiler.graal.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.compiler.phases.TruffleCompilerPhases;
+import jdk.compiler.graal.truffle.phases.TruffleCompilerPhases;
 
 public final class TruffleTierConfiguration {
     private final PartialEvaluatorConfiguration configuration;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java
index 9bde66f1c7b9..1f7b9221fbe4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/TruffleTierContext.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/TruffleTierContext.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler;
+package jdk.compiler.graal.truffle;
 
 import java.util.Objects;
 
@@ -36,7 +36,7 @@
 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.compiler.nodes.TruffleAssumption;
+import jdk.compiler.graal.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/compiler/host/HostInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java
index 8825bc1ca702..03b35b52b5c7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/HostInliningPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/HostInliningPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.host;
+package jdk.compiler.graal.truffle.host;
 
 import static jdk.compiler.graal.core.common.GraalOptions.Intrinsify;
 import static jdk.compiler.graal.phases.common.DeadCodeEliminationPhase.Optionality.Optional;
@@ -78,8 +78,8 @@
 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.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.PartialEvaluator;
 
 import com.oracle.truffle.compiler.HostMethodInfo;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java
index 34577bafd547..8cadbe4b3366 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/InjectImmutableFrameFieldsPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/InjectImmutableFrameFieldsPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.host;
+package jdk.compiler.graal.truffle.host;
 
 import jdk.compiler.graal.graph.Node;
 import jdk.compiler.graal.nodes.StructuredGraph;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleHostEnvironment.java
index ee142582fd83..775ca9c98ce2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleHostEnvironment.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.host;
+package jdk.compiler.graal.truffle.host;
 
 import jdk.compiler.graal.debug.GraalError;
 import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
+import jdk.compiler.graal.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/compiler/host/TruffleKnownHostTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/host/TruffleKnownHostTypes.java
index 887c51f464a9..1df5619ca13d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/host/TruffleKnownHostTypes.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.host;
+package jdk.compiler.graal.truffle.host;
 
-import jdk.compiler.graal.truffle.compiler.AbstractKnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.AbstractKnownTruffleTypes;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotKnownTruffleTypes.java
index f22268e0c3b3..b0e325fd23b7 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotKnownTruffleTypes.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import java.lang.ref.SoftReference;
 import java.lang.ref.WeakReference;
 
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotPartialEvaluator.java
index e7b0e3ea10d1..0af1bf1237f5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotPartialEvaluator.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
@@ -37,9 +37,9 @@
 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.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
+import jdk.compiler.graal.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/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationIdentifier.java
index b8f4634de8d5..e5d5dca32470 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationIdentifier.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import jdk.compiler.graal.hotspot.HotSpotCompilationIdentifier;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.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/compiler/hotspot/HotSpotTruffleCompilationSupport.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilationSupport.java
index a9e5f8cdbea7..243de5a744ab 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilationSupport.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.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.compiler.AbstractTruffleCompilationSupport;
+import jdk.compiler.graal.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/compiler/hotspot/HotSpotTruffleCompilerImpl.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java
index 51ecc721e859..0f884857dea2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleCompilerImpl.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleCompilerImpl.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import static jdk.compiler.graal.core.GraalCompiler.compileGraph;
 import static jdk.compiler.graal.debug.DebugOptions.DebugStubsAndSnippets;
@@ -81,13 +81,13 @@
 import jdk.compiler.graal.phases.util.Providers;
 import jdk.compiler.graal.printer.GraalDebugHandlersFactory;
 import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.compiler.host.InjectImmutableFrameFieldsPhase;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration;
-import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
+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 com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
index a449e5c12c9a..89bd549aef88 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleGraphBuilderPlugins.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleGraphBuilderPlugins.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import java.lang.ref.Reference;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironment.java
index 43a0eb527ca3..f8950d260b3b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironment.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
+import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.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/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleHostEnvironmentLookup.java
index 45b98339ec6c..2e70f3b5e729 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleHostEnvironmentLookup.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import java.util.concurrent.atomic.AtomicReference;
 
 import jdk.compiler.graal.serviceprovider.ServiceProvider;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
similarity index 87%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
index 3d5930e3b2a8..3ad38ede8ec2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleLoweringExtensions.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleLoweringExtensions.java
@@ -22,14 +22,13 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot;
+package jdk.compiler.graal.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.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleSafepointLoweringSnippet.TruffleHotSpotSafepointLoweringExtension;
 
 /**
  * Lowering of HotSpot Truffle specific nodes.
@@ -47,6 +46,6 @@ public final class HotSpotTruffleLoweringExtensions implements DefaultHotSpotLow
 
     @Override
     public List createExtensions() {
-        return Collections.singletonList(new TruffleHotSpotSafepointLoweringExtension(truffleTypes));
+        return Collections.singletonList(new HotSpotTruffleSafepointLoweringSnippet.TruffleHotSpotSafepointLoweringExtension(truffleTypes));
     }
 }
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
index e054b4268621..8c835564c1e4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/HotSpotTruffleSafepointLoweringSnippet.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot;
+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;
@@ -55,8 +55,8 @@
 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.compiler.nodes.TruffleSafepointNode;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleSafepointInsertionPhase;
+import jdk.compiler.graal.truffle.nodes.TruffleSafepointNode;
+import jdk.compiler.graal.truffle.phases.TruffleSafepointInsertionPhase;
 import jdk.compiler.graal.word.Word;
 import org.graalvm.word.LocationIdentity;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCallBoundaryInstrumentationFactory.java
index dd172c256ea9..1a18928f8068 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.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.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfiguration.java
index 1a5ffc490173..7113f0aa3b3d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfiguration.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.hotspot;
+package jdk.compiler.graal.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.compiler.host.InjectImmutableFrameFieldsPhase;
-import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase;
+import jdk.compiler.graal.truffle.host.HostInliningPhase;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
index 578b14f355c5..ecdc5ded9b36 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleCommunityCompilerConfigurationFactory.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleCommunityCompilerConfigurationFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import jdk.compiler.graal.hotspot.CommunityCompilerConfigurationFactory;
 import jdk.compiler.graal.hotspot.CompilerConfigurationFactory;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java
index 4d19cb09fa1b..c9f728a60785 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/TruffleEntryPointDecorator.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/TruffleEntryPointDecorator.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot;
+package jdk.compiler.graal.truffle.hotspot;
 
 import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
 
@@ -33,7 +33,7 @@
 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.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
 
 import jdk.vm.ci.meta.MetaAccessProvider;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
index 731afbc49191..7d7984578f40 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/aarch64/AArch64TruffleCallBoundaryInstrumentationFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot.aarch64;
+package jdk.compiler.graal.truffle.hotspot.aarch64;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
 import static jdk.vm.ci.meta.JavaKind.Object;
@@ -44,9 +44,9 @@
 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.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import jdk.compiler.graal.truffle.compiler.hotspot.TruffleEntryPointDecorator;
+import jdk.compiler.graal.truffle.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.compiler.graal.truffle.hotspot.TruffleEntryPointDecorator;
 
 import jdk.vm.ci.code.Register;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
index 5e584aa1ab3c..c8d6b33c7bf5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/hotspot/amd64/AMD64TruffleCallBoundaryInstrumentationFactory.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.hotspot.amd64;
+package jdk.compiler.graal.truffle.hotspot.amd64;
 
 import static jdk.vm.ci.hotspot.HotSpotCallingConventionType.JavaCall;
 import static jdk.compiler.graal.hotspot.meta.HotSpotHostForeignCallsProvider.Z_FIELD_BARRIER;
@@ -42,9 +42,9 @@
 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.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import jdk.compiler.graal.truffle.compiler.hotspot.TruffleEntryPointDecorator;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
+import jdk.compiler.graal.truffle.hotspot.TruffleCallBoundaryInstrumentationFactory;
+import jdk.compiler.graal.truffle.hotspot.TruffleEntryPointDecorator;
+import jdk.compiler.graal.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/compiler/nodes/AnyExtendNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java
index 9a1fcb2426f9..33c42d22b8e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/AnyExtendNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/AnyExtendNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.nodes;
 
 import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_1;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java
index b7f2416bb868..0cbc6def5fd9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/IsCompilationConstantNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/IsCompilationConstantNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.nodes;
 
 import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
 import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_1;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java
index 24eb824409ab..a705f04be8c4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/ObjectLocationIdentity.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/ObjectLocationIdentity.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.nodes;
 
 import java.util.Objects;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java
index 47eedc5bcbd8..52f76a54d157 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/SpeculativeExceptionAnchorNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/SpeculativeExceptionAnchorNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.nodes;
 
 import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
 import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_0;
@@ -35,7 +35,7 @@
 import jdk.compiler.graal.nodeinfo.NodeInfo;
 import jdk.compiler.graal.nodes.DeoptimizeNode;
 import jdk.compiler.graal.nodes.FixedWithNextNode;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
+import jdk.compiler.graal.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/compiler/nodes/TruffleAssumption.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleAssumption.java
index cbce066453e3..590e6aa2a4c4 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleAssumption.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.nodes;
+package jdk.compiler.graal.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/compiler/nodes/TruffleSafepointNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java
index 1930c39a8c34..c578b4b3cb6e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/TruffleSafepointNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/TruffleSafepointNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes;
+package jdk.compiler.graal.truffle.nodes;
 
 import static jdk.compiler.graal.nodeinfo.NodeSize.SIZE_4;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java
index e39e5f1e849f..5c2af7a0153a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/asserts/NeverPartOfCompilationNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/asserts/NeverPartOfCompilationNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.asserts;
+package jdk.compiler.graal.truffle.nodes.asserts;
 
 import static jdk.compiler.graal.nodeinfo.InputType.State;
 import static jdk.compiler.graal.nodeinfo.NodeCycles.CYCLES_0;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java
index ff1d472acf84..7f6460ede916 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/AllowMaterializeNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/AllowMaterializeNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java
index 761618c66df8..d080cdc5b897 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/ForceMaterializeNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/ForceMaterializeNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java
index 4a6fdcf21726..1cf3ccb3a6bb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/NewFrameNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/NewFrameNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
@@ -55,7 +55,7 @@
 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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.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/compiler/nodes/frame/VirtualFrameAccessFlags.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java
index eb8c3e946cfb..7bc3aa4219eb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessFlags.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessFlags.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.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/compiler/nodes/frame/VirtualFrameAccessType.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessType.java
index fba9a04a9935..57bc484d60e8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessType.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.nodes.frame;
 
 public enum VirtualFrameAccessType {
     Indexed,
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
index 6dfb387e0491..fce3e762b97c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessVerificationNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessVerificationNode.java
@@ -23,10 +23,10 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+package jdk.compiler.graal.truffle.nodes.frame;
 
 import jdk.compiler.graal.nodes.ValueNodeInterface;
-import jdk.compiler.graal.truffle.compiler.phases.FrameAccessVerificationPhase;
+import jdk.compiler.graal.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/compiler/nodes/frame/VirtualFrameAccessorNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java
index 6e152eff2e6b..e712f26c5619 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameAccessorNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameAccessorNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java
index cf9237ef478b..7cddde079df5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameClearNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameClearNode.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java
index 1a20f47d3a16..dc868a5e7ef5 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameCopyNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameCopyNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java
index 11969a845d96..cd61d48c6dd9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java
index 5fed7bebadea..d4300842f382 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameGetTagNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameGetTagNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java
index df334380022c..6b9e5dbad715 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameIsNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameIsNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java
index 356124d0f47f..8a65b3e5a322 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSetNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSetNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java
index b85c9d9dca8c..38f39f2cc592 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/nodes/frame/VirtualFrameSwapNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/nodes/frame/VirtualFrameSwapNode.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.nodes.frame;
+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;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java
index 9ea147c5d7d8..65f52d80d973 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/DeoptimizeOnExceptionPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/DeoptimizeOnExceptionPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import java.util.function.Predicate;
 
@@ -32,7 +32,7 @@
 import jdk.compiler.graal.nodes.InvokeWithExceptionNode;
 import jdk.compiler.graal.nodes.StructuredGraph;
 import jdk.compiler.graal.phases.Phase;
-import jdk.compiler.graal.truffle.compiler.nodes.SpeculativeExceptionAnchorNode;
+import jdk.compiler.graal.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/compiler/phases/FrameAccessVerificationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java
index 90fa7078a95a..6a921f57d692 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/FrameAccessVerificationPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/FrameAccessVerificationPhase.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -34,6 +34,11 @@
 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 org.graalvm.collections.EconomicMap;
 import jdk.compiler.graal.core.common.util.CompilationAlarm;
 import jdk.compiler.graal.debug.DebugContext;
@@ -55,14 +60,9 @@
 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.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessFlags;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessType;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessVerificationNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSetNode;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InliningAcrossTruffleBoundaryPhase.java
index 8dcc553609f9..04a5e7ff61cd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InliningAcrossTruffleBoundaryPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.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.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java
index 6bbf6c8388d1..c37fdefa8e8c 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentBranchesPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentBranchesPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
 import jdk.compiler.graal.debug.MethodFilter;
@@ -32,7 +32,7 @@
 import jdk.compiler.graal.nodes.StructuredGraph;
 
 import jdk.vm.ci.meta.JavaConstant;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.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/compiler/phases/InstrumentPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentPhase.java
index 531f32db6edb..7ccd718bd38b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
-import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBoundaries;
-import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBoundariesPerInlineSite;
-import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBranches;
-import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentBranchesPerInlineSite;
-import static jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.InstrumentationTableSize;
+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 java.util.AbstractMap;
 import java.util.ArrayList;
@@ -54,9 +54,9 @@
 import jdk.compiler.graal.nodes.java.StoreIndexedNode;
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions;
+import jdk.compiler.graal.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/compiler/phases/InstrumentTruffleBoundariesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java
index a6a29569ac94..6b2c19f56fd3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentTruffleBoundariesPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentTruffleBoundariesPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
 import jdk.compiler.graal.debug.MethodFilter;
@@ -31,7 +31,7 @@
 import jdk.compiler.graal.nodes.FixedWithNextNode;
 import jdk.compiler.graal.nodes.Invoke;
 import jdk.compiler.graal.nodes.StructuredGraph;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime.InlineKind;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/InstrumentationSuite.java
index 8c26de145240..33ac6802c178 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/InstrumentationSuite.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.api.replacements.SnippetReflectionProvider;
 import jdk.compiler.graal.phases.PhaseSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 public class InstrumentationSuite extends PhaseSuite {
     @SuppressWarnings("this-escape")
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java
similarity index 90%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/MaterializeFramesPhase.java
index fb18f6df0dcb..f0242765ba84 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/MaterializeFramesPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.nodes.StructuredGraph;
 import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.AllowMaterializeNode;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.nodes.frame.AllowMaterializeNode;
 
 public final class MaterializeFramesPhase extends BasePhase {
     @Override
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/NeverPartOfCompilationPhase.java
index 3baa7c543a85..4228ea3f5c71 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/NeverPartOfCompilationPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.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.compiler.nodes.asserts.NeverPartOfCompilationNode;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.nodes.asserts.NeverPartOfCompilationNode;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 public final class NeverPartOfCompilationPhase extends BasePhase {
     @Override
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java
index 440ee442ecbf..48898837e3ed 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/PhiTransformPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/PhiTransformPhase.java
@@ -23,7 +23,7 @@
  * questions.
  */
 
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import org.graalvm.collections.EconomicSet;
 import jdk.compiler.graal.core.common.type.Stamp;
@@ -51,7 +51,7 @@
 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.compiler.nodes.AnyExtendNode;
+import jdk.compiler.graal.truffle.nodes.AnyExtendNode;
 
 import jdk.vm.ci.meta.ResolvedJavaType;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/ReportPerformanceWarningsPhase.java
index fc14a1ea8c85..49882b758f94 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/ReportPerformanceWarningsPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.nodes.StructuredGraph;
 import jdk.compiler.graal.phases.BasePhase;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 public final class ReportPerformanceWarningsPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/SetIdentityForValueTypesPhase.java
index ecb96191632e..4e1d3fbea665 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/SetIdentityForValueTypesPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.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.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java
index e39d4a120950..f61e48bc02e2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleCompilerPhases.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleCompilerPhases.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import java.util.ListIterator;
 
@@ -32,7 +32,7 @@
 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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
 
 public final class TruffleCompilerPhases {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java
index abfa8689de07..91cbf7c34c18 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleLoopSafepointEliminationPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleLoopSafepointEliminationPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.graph.Node;
 import jdk.compiler.graal.loop.phases.LoopSafepointEliminationPhase;
@@ -33,7 +33,7 @@
 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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
 
 import jdk.vm.ci.meta.ResolvedJavaMethod;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java
index 3c5f76c321cc..2eb46fe91aa2 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleSafepointInsertionPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleSafepointInsertionPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.core.common.type.ObjectStamp;
 import jdk.compiler.graal.core.common.type.StampFactory;
@@ -43,9 +43,9 @@
 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.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.nodes.TruffleSafepointNode;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.TruffleCompilation;
+import jdk.compiler.graal.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/compiler/phases/TruffleTier.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java
similarity index 84%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/TruffleTier.java
index fab7c19f6242..8b5d4f4c216e 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/TruffleTier.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.truffle.phases;
 
 import jdk.compiler.graal.core.phases.BaseTier;
 import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.phases.inlining.AgnosticInliningPhase;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.truffle.PostPartialEvaluationSuite;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.truffle.phases.inlining.AgnosticInliningPhase;
 
 public class TruffleTier extends BaseTier {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/VerifyFrameDoesNotEscapePhase.java
index 427662b77049..3459924f81cd 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/VerifyFrameDoesNotEscapePhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases;
+package jdk.compiler.graal.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.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode;
+import jdk.compiler.graal.truffle.TruffleTierContext;
+import jdk.compiler.graal.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/compiler/phases/inlining/AgnosticInliningPhase.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java
similarity index 92%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java
index eb5c43baf4c7..d008dc114b83 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/AgnosticInliningPhase.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/AgnosticInliningPhase.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -32,11 +32,11 @@
 import jdk.compiler.graal.phases.BasePhase;
 import jdk.compiler.graal.phases.util.GraphOrder;
 import jdk.compiler.graal.serviceprovider.GraalServices;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.TruffleInliningScope;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+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;
 
 public final class AgnosticInliningPhase extends BasePhase {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallNode.java
index e09306bde051..f63f078579a9 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallNode.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import java.util.Collections;
 import java.util.HashMap;
@@ -48,13 +48,13 @@
 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.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
+import jdk.compiler.graal.truffle.PerformanceInformationHandler;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions.PerformanceWarningKind;
 
 import com.oracle.truffle.compiler.TruffleCompilable;
 import com.oracle.truffle.compiler.TruffleCompilationTask;
 
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+import jdk.compiler.graal.truffle.TruffleTierContext;
 
 import jdk.vm.ci.meta.JavaConstant;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/CallTree.java
index a9f2c761b473..73bf339b968a 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/CallTree.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import jdk.compiler.graal.debug.DebugContext;
 import jdk.compiler.graal.graph.Graph;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+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 com.oracle.truffle.compiler.TruffleCompilationTask;
 import com.oracle.truffle.compiler.TruffleCompilerRuntime;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java
similarity index 98%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicy.java
index 66733c06adf4..5fbd26953851 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicy.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases.inlining;
+package jdk.compiler.graal.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.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions;
 
 final class DefaultInliningPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java
index fd3985f6adc3..56c741fcd8ec 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/DefaultInliningPolicyProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/DefaultInliningPolicyProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import jdk.compiler.graal.nodes.spi.CoreProviders;
 import jdk.compiler.graal.options.OptionValues;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java
index 5e6ebc9aec75..8b2f83c0b6b3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/GraphManager.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/GraphManager.java
@@ -22,10 +22,11 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import java.util.List;
 
+import jdk.compiler.graal.truffle.nodes.TruffleAssumption;
 import org.graalvm.collections.EconomicMap;
 import org.graalvm.collections.EconomicSet;
 import org.graalvm.collections.UnmodifiableEconomicMap;
@@ -42,13 +43,12 @@
 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.compiler.PEAgnosticInlineInvokePlugin;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
-import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption;
+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 com.oracle.truffle.compiler.TruffleCompilable;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicy.java
index 6adcdd85c894..78e6a64db083 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicy.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases.inlining;
+package jdk.compiler.graal.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.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions;
 
 @SuppressWarnings("unused")
 public interface InliningPolicy {
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java
index 6f68e77b0f6e..3538e541967b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/InliningPolicyProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/InliningPolicyProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import jdk.compiler.graal.nodes.spi.CoreProviders;
 import jdk.compiler.graal.options.OptionValues;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java
similarity index 95%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicy.java
index 22665f1b94f9..aa531d04265b 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicy.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 final class NoInliningPolicy implements InliningPolicy {
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java
index 8e4db31f86a8..83f0cd8083e3 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/NoInliningPolicyProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/NoInliningPolicyProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import jdk.compiler.graal.nodes.spi.CoreProviders;
 import jdk.compiler.graal.options.OptionValues;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
similarity index 93%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyInliningPolicy.java
index 12d8af1eeb53..824ae68f7165 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyInliningPolicy.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions;
 
 final class TrivialOnlyInliningPolicy implements InliningPolicy {
     private final OptionValues options;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
similarity index 96%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
index 93019d388967..40af0be596f8 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/phases/inlining/TrivialOnlyPolicyProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/phases/inlining/TrivialOnlyPolicyProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.phases.inlining;
+package jdk.compiler.graal.truffle.phases.inlining;
 
 import jdk.compiler.graal.nodes.spi.CoreProviders;
 import jdk.compiler.graal.options.OptionValues;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
similarity index 94%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphBuilderInvocationPluginProvider.java
index db7c785269c2..1af4014777fb 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphBuilderInvocationPluginProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/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.compiler.substitutions;
+package jdk.compiler.graal.truffle.substitutions;
 
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.phases.util.Providers;
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.truffle.KnownTruffleTypes;
 
 import jdk.vm.ci.code.Architecture;
 
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
index 62779462a274..f834f6ff2943 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/GraphDecoderInvocationPluginProvider.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/GraphDecoderInvocationPluginProvider.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.substitutions;
 
 import jdk.compiler.graal.nodes.graphbuilderconf.InvocationPlugins;
 import jdk.compiler.graal.phases.util.Providers;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
similarity index 97%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
index 3672988688c1..e5ef4103ce7d 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleGraphBuilderPlugins.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleGraphBuilderPlugins.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.substitutions;
 
 import static java.lang.Character.toUpperCase;
 import static jdk.compiler.graal.replacements.PEGraphDecoder.Options.MaximumLoopExplosionCount;
@@ -97,29 +97,29 @@
 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.compiler.nodes.asserts.NeverPartOfCompilationNode;
-import jdk.compiler.graal.truffle.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.PerformanceInformationHandler;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions.PerformanceWarningKind;
-import jdk.compiler.graal.truffle.compiler.TruffleDebugJavaMethod;
-import jdk.compiler.graal.truffle.compiler.nodes.AnyExtendNode;
-import jdk.compiler.graal.truffle.compiler.nodes.IsCompilationConstantNode;
-import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
-import jdk.compiler.graal.truffle.compiler.nodes.TruffleAssumption;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.AllowMaterializeNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.ForceMaterializeNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.NewFrameNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessFlags;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameAccessType;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameClearNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameCopyNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameGetNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameGetTagNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameIsNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSetNode;
-import jdk.compiler.graal.truffle.compiler.nodes.frame.VirtualFrameSwapNode;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleSafepointInsertionPhase;
+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 org.graalvm.word.LocationIdentity;
 
 import com.oracle.truffle.compiler.TruffleCompilationTask;
diff --git a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java
similarity index 99%
rename from compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
rename to compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java
index 325ce88e7d0d..4ac42d929779 100644
--- a/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/compiler/substitutions/TruffleInvocationPlugins.java
+++ b/compiler/src/jdk.compiler.graal/src/jdk/compiler/graal/truffle/substitutions/TruffleInvocationPlugins.java
@@ -22,7 +22,7 @@
  * or visit www.oracle.com if you need additional information or have any
  * questions.
  */
-package jdk.compiler.graal.truffle.compiler.substitutions;
+package jdk.compiler.graal.truffle.substitutions;
 
 import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.BMP;
 import static jdk.compiler.graal.lir.gen.LIRGeneratorTool.CalcStringAttributesEncoding.LATIN1;
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 3c90b07a86e2..41f5294a5efc 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
@@ -25,7 +25,7 @@
 package com.oracle.svm.core.meta;
 
 import jdk.compiler.graal.api.replacements.Fold;
-import jdk.compiler.graal.truffle.compiler.nodes.ObjectLocationIdentity;
+import jdk.compiler.graal.truffle.nodes.ObjectLocationIdentity;
 import org.graalvm.nativeimage.ImageSingletons;
 
 import jdk.vm.ci.meta.ConstantReflectionProvider;
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 5811c92df812..08ebb2223883 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
@@ -88,12 +88,12 @@
 import jdk.compiler.graal.serviceprovider.GlobalAtomicLong;
 import jdk.compiler.graal.serviceprovider.GraalServices;
 import jdk.compiler.graal.serviceprovider.SpeculationReasonGroup;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.hotspot.TruffleCallBoundaryInstrumentationFactory;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphBuilderInvocationPluginProvider;
-import jdk.compiler.graal.truffle.compiler.substitutions.GraphDecoderInvocationPluginProvider;
+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 org.graalvm.jniutils.JNI;
 import org.graalvm.jniutils.JNIExceptionWrapper;
 import org.graalvm.jniutils.JNIMethodScope;
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 cbcf66645874..7d725e836394 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
@@ -25,10 +25,10 @@
 package com.oracle.svm.graal.hotspot.libgraal.truffle;
 
 import jdk.compiler.graal.core.common.util.MethodKey;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
+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 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 88c08314d914..1f7cdc8fb36d 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
@@ -26,7 +26,7 @@
 
 import jdk.compiler.graal.debug.GraalError;
 import jdk.compiler.graal.serviceprovider.GlobalAtomicLong;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.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 3e06970294d9..14cfb16ed4ca 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.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.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/TruffleToLibGraalEntryPoints.java b/substratevm/src/com.oracle.svm.graal.hotspot.libgraal/src/com/oracle/svm/graal/hotspot/libgraal/truffle/TruffleToLibGraalEntryPoints.java
index f5b597d38449..2b669c1d7aa3 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
@@ -53,9 +53,9 @@
 import jdk.compiler.graal.hotspot.CompilationContext;
 import jdk.compiler.graal.hotspot.HotSpotGraalServices;
 import jdk.compiler.graal.serviceprovider.IsolateUtil;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilationSupport;
-import jdk.compiler.graal.truffle.compiler.hotspot.HotSpotTruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleCompilerOptions;
+import jdk.compiler.graal.truffle.hotspot.HotSpotTruffleCompilationSupport;
+import jdk.compiler.graal.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/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/LegacyRuntimeCompilationFeature.java
index a678e782ce4e..72574ffd7752 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
@@ -63,7 +63,7 @@
 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.compiler.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase;
 import jdk.compiler.graal.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/ParseOnceRuntimeCompilationFeature.java b/substratevm/src/com.oracle.svm.graal/src/com/oracle/svm/graal/hosted/ParseOnceRuntimeCompilationFeature.java
index 274be546564e..01d462b54313 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
@@ -128,7 +128,7 @@
 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.compiler.phases.DeoptimizeOnExceptionPhase;
+import jdk.compiler.graal.truffle.phases.DeoptimizeOnExceptionPhase;
 import jdk.compiler.graal.word.WordTypes;
 import jdk.vm.ci.code.BytecodeFrame;
 import jdk.vm.ci.code.BytecodePosition;
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 a7199ec4f5ed..3a5b31fe5afa 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
@@ -35,7 +35,7 @@
 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.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.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.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/SubstrateHostInliningPhase.java
index 2eb9e0d9a2c2..c1f3247d620e 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
@@ -28,8 +28,8 @@
 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.compiler.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
+import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.compiler.graal.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 84eae97178e0..a1a0d7f89b01 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
@@ -25,7 +25,7 @@
 package com.oracle.svm.truffle;
 
 import jdk.compiler.graal.debug.GraalError;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.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 7648a45da8d3..ffaf997f8876 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.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleElementCache;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.TruffleCompilerImpl;
+import jdk.compiler.graal.truffle.TruffleElementCache;
+import jdk.compiler.graal.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 803999f02689..76ff2e4ff9d1 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.compiler.host.TruffleHostEnvironment;
+import jdk.compiler.graal.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 2cdd2dddd4e2..c0fee5f35bd0 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
@@ -74,9 +74,9 @@
 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.compiler.host.InjectImmutableFrameFieldsPhase;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.compiler.substitutions.TruffleInvocationPlugins;
+import jdk.compiler.graal.truffle.host.InjectImmutableFrameFieldsPhase;
+import jdk.compiler.graal.truffle.host.TruffleHostEnvironment;
+import jdk.compiler.graal.truffle.substitutions.TruffleInvocationPlugins;
 import org.graalvm.home.HomeFinder;
 import org.graalvm.home.impl.DefaultHomeFinder;
 import org.graalvm.nativeimage.AnnotationAccess;
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 a5e3af90a9d4..b9305b2fd7e6 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
@@ -120,11 +120,11 @@
 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.compiler.KnownTruffleTypes;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.host.HostInliningPhase;
-import jdk.compiler.graal.truffle.compiler.host.TruffleHostEnvironment;
-import jdk.compiler.graal.truffle.compiler.nodes.asserts.NeverPartOfCompilationNode;
+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 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 e8156ffb6cce..0e5a9ab03a98 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
@@ -31,11 +31,11 @@
 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.compiler.EconomyPartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration;
+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 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 b07d647ee569..e1ee0484542e 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.compiler.KnownTruffleTypes;
+import jdk.compiler.graal.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 984e5882a8a6..8938afda5748 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
@@ -27,7 +27,7 @@
 import java.lang.ref.WeakReference;
 
 import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
+import jdk.compiler.graal.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/SubstratePartialEvaluator.java b/substratevm/src/com.oracle.svm.truffle/src/com/oracle/svm/truffle/api/SubstratePartialEvaluator.java
index c9306b099e44..edfd748ab2b4 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
@@ -40,10 +40,10 @@
 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.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluatorConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleTierContext;
+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 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 de923908613d..b61c8df16cf5 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
@@ -25,7 +25,7 @@
 package com.oracle.svm.truffle.api;
 
 import jdk.compiler.graal.options.OptionValues;
-import jdk.compiler.graal.truffle.compiler.PostPartialEvaluationSuite;
+import jdk.compiler.graal.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 26e5373cd28b..40f051c8c282 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
@@ -45,7 +45,7 @@
 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.compiler.nodes.TruffleSafepointNode;
+import jdk.compiler.graal.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 01fde99646bf..0494c5602f91 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.compiler.AbstractTruffleCompilationSupport;
+import jdk.compiler.graal.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 033b31b8d053..850bbbcd92e2 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.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+import jdk.compiler.graal.truffle.PartialEvaluator;
+import jdk.compiler.graal.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 abc81a56300f..795dc9f46a1f 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
@@ -36,14 +36,14 @@
 import jdk.compiler.graal.options.OptionValues;
 import jdk.compiler.graal.phases.PhaseSuite;
 import jdk.compiler.graal.phases.tiers.HighTierContext;
-import jdk.compiler.graal.truffle.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerConfiguration;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerImpl;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilerOptions;
-import jdk.compiler.graal.truffle.compiler.TruffleTierConfiguration;
-import jdk.compiler.graal.truffle.compiler.phases.InstrumentationSuite;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+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 org.graalvm.nativeimage.Platform;
 import org.graalvm.nativeimage.Platforms;
 
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 638a6d855ba1..9d016b636577 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
@@ -32,7 +32,7 @@
 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.compiler.PartialEvaluator;
+import jdk.compiler.graal.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 94bd8f232cfc..0ce13f18b131 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
@@ -31,9 +31,9 @@
 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.compiler.PartialEvaluator;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilation;
-import jdk.compiler.graal.truffle.compiler.phases.TruffleTier;
+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 org.graalvm.nativeimage.CurrentIsolate;
 import org.graalvm.nativeimage.Isolate;
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 0283d05d3868..4ccd05fd2914 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
@@ -25,7 +25,7 @@
 package com.oracle.svm.truffle.isolated;
 
 import jdk.compiler.graal.core.common.CompilationIdentifier;
-import jdk.compiler.graal.truffle.compiler.TruffleCompilationIdentifier;
+import jdk.compiler.graal.truffle.TruffleCompilationIdentifier;
 import org.graalvm.nativeimage.c.function.CEntryPoint;
 
 import com.oracle.svm.graal.isolated.ClientHandle;

From 206d616192ae126d1700119386fb39007a07e295 Mon Sep 17 00:00:00 2001
From: Doug Simon 
Date: Thu, 19 Oct 2023 10:49:49 +0200
Subject: [PATCH 6/6] updated CHANGELOG.md

---
 compiler/CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/compiler/CHANGELOG.md b/compiler/CHANGELOG.md
index 31ef3dca6315..7da44adbe7cd 100644
--- a/compiler/CHANGELOG.md
+++ b/compiler/CHANGELOG.md
@@ -2,6 +2,11 @@
 
 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.
+  These renamings were done in preparation for [Project Galahad](https://openjdk.org/projects/galahad/).
+
 ## GraalVM for JDK 21 (Internal Version 23.1.0)
 * (GR-43228): Enforce backward-edge control-flow integrity (CFI) on aarch64 based on the `UseBranchProtection` JVM flag.